diff options
author | Mike Krüger <mkrueger@novell.com> | 2009-07-01 18:57:16 +0400 |
---|---|---|
committer | Mike Krüger <mkrueger@novell.com> | 2009-07-01 18:57:16 +0400 |
commit | e390b6733713e34c0f82d67d77b5fcc2ba015fd0 (patch) | |
tree | 283c70cac5c2dabc039c4c3af9eea0aae70fa421 /main | |
parent | f095d193c8b4fffc54046560661f97b81e8e4f80 (diff) |
* Makefile.am:
* gtk-gui/gui.stetic:
* MonoDevelop.Ide.csproj: Removed unused references & corrected
gui.stetic.
svn path=/trunk/monodevelop/; revision=137195
Diffstat (limited to 'main')
-rw-r--r-- | main/src/core/MonoDevelop.Ide/ChangeLog | 7 | ||||
-rw-r--r-- | main/src/core/MonoDevelop.Ide/Makefile.am | 1 | ||||
-rw-r--r-- | main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.csproj | 4 | ||||
-rw-r--r-- | main/src/core/MonoDevelop.Ide/gtk-gui/gui.stetic | 285 |
4 files changed, 8 insertions, 289 deletions
diff --git a/main/src/core/MonoDevelop.Ide/ChangeLog b/main/src/core/MonoDevelop.Ide/ChangeLog index c6f2334961..046591abd1 100644 --- a/main/src/core/MonoDevelop.Ide/ChangeLog +++ b/main/src/core/MonoDevelop.Ide/ChangeLog @@ -1,6 +1,13 @@ 2009-07-01 Mike Krüger <mkrueger@novell.com> * Makefile.am: + * gtk-gui/gui.stetic: + * MonoDevelop.Ide.csproj: Removed unused references & + corrected gui.stetic. + +2009-07-01 Mike Krüger <mkrueger@novell.com> + + * Makefile.am: * MonoDevelop.Ide.csproj: * MonoDevelop.Ide.addin.xml: * MonoDevelop.Ide.Refactoring: diff --git a/main/src/core/MonoDevelop.Ide/Makefile.am b/main/src/core/MonoDevelop.Ide/Makefile.am index a9b73d4097..363fcb20ee 100644 --- a/main/src/core/MonoDevelop.Ide/Makefile.am +++ b/main/src/core/MonoDevelop.Ide/Makefile.am @@ -1,6 +1,5 @@ DEPS = \ - $(top_builddir)/build/AddIns/VersionControl/Diff.dll \ $(top_builddir)/build/bin/Mono.Debugging.dll \ $(top_builddir)/build/bin/Mono.TextEditor.dll \ $(top_builddir)/build/bin/MonoDevelop.Components.dll \ diff --git a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.csproj b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.csproj index 22afcc5094..e2bd1c74eb 100644 --- a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.csproj +++ b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.csproj @@ -113,10 +113,6 @@ <Project>{A2329308-3751-4DBD-9A75-5F7B8B024625}</Project> <Name>Mono.TextEditor</Name> </ProjectReference> - <ProjectReference Include="..\..\addins\VersionControl\Diff\Diff.csproj"> - <Project>{7FF7B14D-BFE7-493A-9B52-B5F4CA71A2DC}</Project> - <Name>Diff</Name> - </ProjectReference> </ItemGroup> <ItemGroup> <EmbeddedResource Include="templates\AppConfigFile.xft.xml"> diff --git a/main/src/core/MonoDevelop.Ide/gtk-gui/gui.stetic b/main/src/core/MonoDevelop.Ide/gtk-gui/gui.stetic index 20b9eee9bc..817a38f9df 100644 --- a/main/src/core/MonoDevelop.Ide/gtk-gui/gui.stetic +++ b/main/src/core/MonoDevelop.Ide/gtk-gui/gui.stetic @@ -6879,290 +6879,7 @@ Large</property> </widget> </child> </widget> - <widget class="Gtk.Dialog" id="MonoDevelop.Ide.Refactoring.RenameItemDialog" design-size="365 166"> - <property name="MemberName" /> - <property name="Title" translatable="yes">Rename {0}</property> - <property name="WindowPosition">Center</property> - <property name="BorderWidth">6</property> - <property name="DefaultWidth">0</property> - <property name="DefaultHeight">0</property> - <property name="SkipPagerHint">True</property> - <property name="SkipTaskbarHint">True</property> - <property name="FocusOnMap">False</property> - <property name="Buttons">3</property> - <property name="HelpButton">False</property> - <child internal-child="VBox"> - <widget class="Gtk.VBox" id="dialog1_VBox"> - <property name="MemberName" /> - <property name="Spacing">6</property> - <property name="BorderWidth">2</property> - <child> - <widget class="Gtk.VBox" id="vbox"> - <property name="MemberName" /> - <property name="Spacing">6</property> - <property name="BorderWidth">6</property> - <child> - <widget class="Gtk.HBox" id="hbox"> - <property name="MemberName" /> - <property name="Spacing">6</property> - <child> - <widget class="Gtk.Label" id="labelNewName"> - <property name="MemberName" /> - <property name="LabelProp" translatable="yes">New na_me:</property> - <property name="UseUnderline">True</property> - <property name="MnemonicWidget">entry</property> - </widget> - <packing> - <property name="Position">0</property> - <property name="AutoSize">True</property> - <property name="Expand">False</property> - <property name="Fill">False</property> - </packing> - </child> - <child> - <widget class="Gtk.Entry" id="entry"> - <property name="MemberName" /> - <property name="CanFocus">True</property> - <property name="IsEditable">True</property> - <property name="InvisibleChar">●</property> - </widget> - <packing> - <property name="Position">1</property> - <property name="AutoSize">True</property> - </packing> - </child> - </widget> - <packing> - <property name="Position">0</property> - <property name="AutoSize">True</property> - <property name="Expand">False</property> - <property name="Fill">False</property> - </packing> - </child> - <child> - <widget class="Gtk.CheckButton" id="renameFileFlag"> - <property name="MemberName" /> - <property name="Visible">False</property> - <property name="CanFocus">True</property> - <property name="Label" translatable="yes">Rename file that contains public class</property> - <property name="Active">True</property> - <property name="DrawIndicator">True</property> - <property name="HasLabel">True</property> - <property name="UseUnderline">True</property> - </widget> - <packing> - <property name="Position">1</property> - <property name="AutoSize">True</property> - <property name="Expand">False</property> - <property name="Fill">False</property> - </packing> - </child> - <child> - <widget class="Gtk.HBox" id="hbox1"> - <property name="MemberName" /> - <property name="Spacing">6</property> - <child> - <widget class="Gtk.Image" id="imageWarning"> - <property name="MemberName" /> - <property name="Pixbuf">stock:gtk-apply Button</property> - </widget> - <packing> - <property name="Position">0</property> - <property name="AutoSize">True</property> - <property name="Expand">False</property> - <property name="Fill">False</property> - </packing> - </child> - <child> - <widget class="Gtk.Label" id="labelWarning"> - <property name="MemberName" /> - </widget> - <packing> - <property name="Position">1</property> - <property name="AutoSize">True</property> - <property name="Expand">False</property> - <property name="Fill">False</property> - </packing> - </child> - </widget> - <packing> - <property name="Position">2</property> - <property name="AutoSize">True</property> - <property name="Expand">False</property> - <property name="Fill">False</property> - </packing> - </child> - </widget> - <packing> - <property name="Position">0</property> - <property name="AutoSize">True</property> - <property name="Expand">False</property> - <property name="Fill">False</property> - </packing> - </child> - </widget> - </child> - <child internal-child="ActionArea"> - <widget class="Gtk.HButtonBox" id="dialog1_ActionArea"> - <property name="MemberName" /> - <property name="Spacing">6</property> - <property name="BorderWidth">5</property> - <property name="Size">3</property> - <property name="LayoutStyle">End</property> - <child> - <widget class="Gtk.Button" id="buttonCancel"> - <property name="MemberName" /> - <property name="CanDefault">True</property> - <property name="CanFocus">True</property> - <property name="UseStock">True</property> - <property name="Type">StockItem</property> - <property name="StockId">gtk-cancel</property> - <property name="ResponseId">-6</property> - <property name="label">gtk-cancel</property> - </widget> - <packing> - <property name="Expand">False</property> - <property name="Fill">False</property> - </packing> - </child> - <child> - <widget class="Gtk.Button" id="buttonPreview"> - <property name="MemberName" /> - <property name="CanFocus">True</property> - <property name="Type">TextOnly</property> - <property name="Label" translatable="yes">_Preview</property> - <property name="UseUnderline">True</property> - <property name="ResponseId">-5</property> - </widget> - <packing> - <property name="Position">1</property> - <property name="Expand">False</property> - <property name="Fill">False</property> - </packing> - </child> - <child> - <widget class="Gtk.Button" id="buttonOk"> - <property name="MemberName" /> - <property name="CanDefault">True</property> - <property name="CanFocus">True</property> - <property name="UseStock">True</property> - <property name="Type">StockItem</property> - <property name="StockId">gtk-ok</property> - <property name="ResponseId">-5</property> - <property name="label">gtk-ok</property> - </widget> - <packing> - <property name="Position">2</property> - <property name="Expand">False</property> - <property name="Fill">False</property> - </packing> - </child> - </widget> - </child> - </widget> - <widget class="Gtk.Dialog" id="MonoDevelop.Ide.Refactoring.RefactoringPreviewDialog" design-size="510 378"> - <property name="MemberName" /> - <property name="Title" translatable="yes">Refactoring Preview</property> - <property name="TypeHint">Dialog</property> - <property name="WindowPosition">Center</property> - <property name="BorderWidth">6</property> - <property name="DefaultWidth">640</property> - <property name="DefaultHeight">420</property> - <property name="SkipPagerHint">True</property> - <property name="SkipTaskbarHint">True</property> - <property name="FocusOnMap">False</property> - <property name="Buttons">2</property> - <property name="HelpButton">False</property> - <child internal-child="VBox"> - <widget class="Gtk.VBox" id="dialog1_VBox"> - <property name="MemberName" /> - <property name="BorderWidth">2</property> - <child> - <widget class="Gtk.VBox" id="vbox2"> - <property name="MemberName" /> - <property name="Spacing">6</property> - <property name="BorderWidth">6</property> - <child> - <widget class="Gtk.Label" id="label1"> - <property name="MemberName" /> - <property name="Xalign">0</property> - <property name="LabelProp" translatable="yes">List of changes for this refactoring:</property> - </widget> - <packing> - <property name="Position">0</property> - <property name="AutoSize">True</property> - <property name="Expand">False</property> - <property name="Fill">False</property> - </packing> - </child> - <child> - <widget class="Gtk.ScrolledWindow" id="GtkScrolledWindow"> - <property name="MemberName" /> - <property name="ShadowType">In</property> - <child> - <widget class="Gtk.TreeView" id="treeviewPreview"> - <property name="MemberName" /> - <property name="CanFocus">True</property> - <property name="ShowScrollbars">True</property> - </widget> - </child> - </widget> - <packing> - <property name="Position">1</property> - <property name="AutoSize">True</property> - </packing> - </child> - </widget> - <packing> - <property name="Position">0</property> - <property name="AutoSize">True</property> - </packing> - </child> - </widget> - </child> - <child internal-child="ActionArea"> - <widget class="Gtk.HButtonBox" id="dialog1_ActionArea"> - <property name="MemberName" /> - <property name="Spacing">10</property> - <property name="BorderWidth">5</property> - <property name="Size">2</property> - <property name="LayoutStyle">End</property> - <child> - <widget class="Gtk.Button" id="buttonCancel"> - <property name="MemberName" /> - <property name="CanDefault">True</property> - <property name="CanFocus">True</property> - <property name="UseStock">True</property> - <property name="Type">StockItem</property> - <property name="StockId">gtk-cancel</property> - <property name="ResponseId">-6</property> - <property name="label">gtk-cancel</property> - </widget> - <packing> - <property name="Expand">False</property> - <property name="Fill">False</property> - </packing> - </child> - <child> - <widget class="Gtk.Button" id="buttonOk"> - <property name="MemberName" /> - <property name="CanDefault">True</property> - <property name="CanFocus">True</property> - <property name="UseStock">True</property> - <property name="Type">StockItem</property> - <property name="StockId">gtk-ok</property> - <property name="ResponseId">-5</property> - <property name="label">gtk-ok</property> - </widget> - <packing> - <property name="Position">1</property> - <property name="Expand">False</property> - <property name="Fill">False</property> - </packing> - </child> - </widget> - </child> - </widget> + <widget class="Gtk.Bin" id="MonoDevelop.Ide.Gui.Dialogs.CustomExecutionModeWidget" design-size="486 313"> <property name="MemberName" /> <property name="Visible">False</property> |