mono
/
mail-archives
зеркало из https://github.com/mono/mail-archives.git
1
0
Форкнуть 0
Код Задачи Пакеты Проекты Релизы Вики Активность
mail-archives/monodevelop-patches-list/2004-March/000773.html

347 строки
17 KiB
HTML
Исходник Ответственный История

<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2//EN">
<HTML>
<HEAD>
<TITLE> [Monodevelop-patches-list] r1167 - in trunk/MonoDevelop/src: AddIns/DisplayBindings/SourceEditor/CodeCompletion AddIns/DisplayBindings/SourceEditor/Gui AddIns/DisplayBindings/SourceEditor/Gui/Dialogs Libraries/MonoDevelop.Gui.Widgets Libraries/MonoDevelop.Gui.Widgets/TabLabel Main/Base/Gui/Dialogs Main/Base/Gui/Dialogs/Wizard Main/Base/Services/Tasks Main/StartUp/Dialogs
</TITLE>
<LINK REL="Index" HREF="index.html" >
<LINK REL="made" HREF="mailto:monodevelop-patches-list%40lists.ximian.com?Subject=%5BMonodevelop-patches-list%5D%20r1167%20-%20in%20trunk/MonoDevelop/src%3A%20AddIns/DisplayBindings/SourceEditor/CodeCompletion%20AddIns/DisplayBindings/SourceEditor/Gui%20AddIns/DisplayBindings/SourceEditor/Gui/Dialogs%20Libraries/MonoDevelop.Gui.Widgets%20Libraries/MonoDevelop.Gui.Widgets/TabLabel%20Main/Base/Gui/Dialogs%20Main/Base/Gui/Dialogs/Wizard%20Main/Base/Services/Tasks%20Main/StartUp/Dialogs&In-Reply-To=">
<META NAME="robots" CONTENT="index,nofollow">
<META http-equiv="Content-Type" content="text/html; charset=us-ascii">
<LINK REL="Previous" HREF="000772.html">
<LINK REL="Next" HREF="000774.html">
</HEAD>
<BODY BGCOLOR="#ffffff">
<H1>[Monodevelop-patches-list] r1167 - in trunk/MonoDevelop/src: AddIns/DisplayBindings/SourceEditor/CodeCompletion AddIns/DisplayBindings/SourceEditor/Gui AddIns/DisplayBindings/SourceEditor/Gui/Dialogs Libraries/MonoDevelop.Gui.Widgets Libraries/MonoDevelop.Gui.Widgets/TabLabel Main/Base/Gui/Dialogs Main/Base/Gui/Dialogs/Wizard Main/Base/Services/Tasks Main/StartUp/Dialogs</H1>
<B>commit-watcher at mono-cvs.ximian.com</B>
<A HREF="mailto:monodevelop-patches-list%40lists.ximian.com?Subject=%5BMonodevelop-patches-list%5D%20r1167%20-%20in%20trunk/MonoDevelop/src%3A%20AddIns/DisplayBindings/SourceEditor/CodeCompletion%20AddIns/DisplayBindings/SourceEditor/Gui%20AddIns/DisplayBindings/SourceEditor/Gui/Dialogs%20Libraries/MonoDevelop.Gui.Widgets%20Libraries/MonoDevelop.Gui.Widgets/TabLabel%20Main/Base/Gui/Dialogs%20Main/Base/Gui/Dialogs/Wizard%20Main/Base/Services/Tasks%20Main/StartUp/Dialogs&In-Reply-To="
TITLE="[Monodevelop-patches-list] r1167 - in trunk/MonoDevelop/src: AddIns/DisplayBindings/SourceEditor/CodeCompletion AddIns/DisplayBindings/SourceEditor/Gui AddIns/DisplayBindings/SourceEditor/Gui/Dialogs Libraries/MonoDevelop.Gui.Widgets Libraries/MonoDevelop.Gui.Widgets/TabLabel Main/Base/Gui/Dialogs Main/Base/Gui/Dialogs/Wizard Main/Base/Services/Tasks Main/StartUp/Dialogs">commit-watcher at mono-cvs.ximian.com
</A><BR>
<I>Sat Mar 13 04:35:35 EST 2004</I>
<P><UL>
<LI>Previous message: <A HREF="000772.html">[Monodevelop-patches-list] r1166 - trunk/MonoDevelop/src/Libraries/MonoDevelop.Gui.Widgets/Tree
</A></li>
<LI>Next message: <A HREF="000774.html">[Monodevelop-patches-list] r1168 - trunk/md-website
</A></li>
<LI> <B>Messages sorted by:</B>
<a href="date.html#773">[ date ]</a>
<a href="thread.html#773">[ thread ]</a>
<a href="subject.html#773">[ subject ]</a>
<a href="author.html#773">[ author ]</a>
</LI>
</UL>
<HR>
<!--beginarticle-->
<PRE>Author: tberman
Date: 2004-03-13 04:35:35 -0500 (Sat, 13 Mar 2004)
New Revision: 1167
Modified:
trunk/MonoDevelop/src/AddIns/DisplayBindings/SourceEditor/CodeCompletion/CompletionWindow.cs
trunk/MonoDevelop/src/AddIns/DisplayBindings/SourceEditor/Gui/Dialogs/ExportProjectToHtmlDialog.cs
trunk/MonoDevelop/src/AddIns/DisplayBindings/SourceEditor/Gui/SourceEditorBuffer.cs
trunk/MonoDevelop/src/Libraries/MonoDevelop.Gui.Widgets/Makefile.am
trunk/MonoDevelop/src/Libraries/MonoDevelop.Gui.Widgets/TabLabel/TabLabel.cs
trunk/MonoDevelop/src/Main/Base/Gui/Dialogs/CommonAboutDialog.cs
trunk/MonoDevelop/src/Main/Base/Gui/Dialogs/Wizard/StatusPanel.cs
trunk/MonoDevelop/src/Main/Base/Gui/Dialogs/Wizard/WizardDialog.cs
trunk/MonoDevelop/src/Main/Base/Services/Tasks/Task.cs
trunk/MonoDevelop/src/Main/StartUp/Dialogs/ExceptionBox.cs
Log:
upgrade to work with gtk# from cvs... yes, this means you have to update.
plus, after you update gtk#, a make clean ; make is a good idea in MD.
Modified: trunk/MonoDevelop/src/AddIns/DisplayBindings/SourceEditor/CodeCompletion/CompletionWindow.cs
===================================================================
--- trunk/MonoDevelop/src/AddIns/DisplayBindings/SourceEditor/CodeCompletion/CompletionWindow.cs 2004-03-12 21:38:33 UTC (rev 1166)
+++ trunk/MonoDevelop/src/AddIns/DisplayBindings/SourceEditor/CodeCompletion/CompletionWindow.cs 2004-03-13 09:35:35 UTC (rev 1167)
@@ -294,16 +294,18 @@
int listpos_x, listpos_y;
GetPosition (out listpos_x, out listpos_y);
int vert = listpos_y + rect.Y;
-
- if (vert &gt;= listpos_y + listView.GdkWindow.Size.Height - 2) {
- vert = listpos_y + listView.GdkWindow.Size.Height - rect.Height;
+
+ int lvWidth, lvHeight;
+ listView.GdkWindow.GetSize (out lvWidth, out lvHeight);
+ if (vert &gt;= listpos_y + lvHeight - 2) {
+ vert = listpos_y + lvHeight - rect.Height;
} else if (vert &lt; listpos_y) {
vert = listpos_y;
}
// FIXME: This is a bad calc, its always on the right,
// it needs to test if thats too big, and if so, place on the left;
- int horiz = listpos_x + listView.GdkWindow.Size.Width + 30;
+ int horiz = listpos_x + lvWidth + 30;
ICompletionDataWithMarkup wMarkup = data as ICompletionDataWithMarkup;
declarationviewwindow.Destroy ();
@@ -319,9 +321,13 @@
return;
declarationviewwindow.ShowAll ();
-
- if (listView.Screen.Width &lt;= horiz + declarationviewwindow.GdkWindow.FrameExtents.Width) {
- horiz = listpos_x - declarationviewwindow.GdkWindow.FrameExtents.Width - 10;
+
+ int dvwWidth, dvwHeight;
+
+ declarationviewwindow.GdkWindow.GetSize (out dvwWidth, out dvwHeight);
+
+ if (listView.Screen.Width &lt;= horiz + dvwWidth) {
+ horiz = listpos_x - dvwWidth - 10;
}
declarationviewwindow.Move (horiz, vert);
Modified: trunk/MonoDevelop/src/AddIns/DisplayBindings/SourceEditor/Gui/Dialogs/ExportProjectToHtmlDialog.cs
===================================================================
--- trunk/MonoDevelop/src/AddIns/DisplayBindings/SourceEditor/Gui/Dialogs/ExportProjectToHtmlDialog.cs 2004-03-12 21:38:33 UTC (rev 1166)
+++ trunk/MonoDevelop/src/AddIns/DisplayBindings/SourceEditor/Gui/Dialogs/ExportProjectToHtmlDialog.cs 2004-03-13 09:35:35 UTC (rev 1167)
@@ -72,7 +72,7 @@
//cancelButton.DialogResult = DialogResult.Cancel;
- RequestSize = new Size (350, 88 + 6);
+ SetSizeRequest (350, 88 + 6);
WindowPosition = WindowPosition.CenterOnParent;
Title = resourceService.GetString (&quot;Dialog.ExportProjectToHtml.DialogName&quot;);
Modified: trunk/MonoDevelop/src/AddIns/DisplayBindings/SourceEditor/Gui/SourceEditorBuffer.cs
===================================================================
--- trunk/MonoDevelop/src/AddIns/DisplayBindings/SourceEditor/Gui/SourceEditorBuffer.cs 2004-03-12 21:38:33 UTC (rev 1166)
+++ trunk/MonoDevelop/src/AddIns/DisplayBindings/SourceEditor/Gui/SourceEditorBuffer.cs 2004-03-13 09:35:35 UTC (rev 1167)
@@ -235,10 +235,10 @@
[DllImport(&quot;gtksourceview-1.0&quot;)]
static extern void gtk_source_buffer_delete_marker(IntPtr raw, IntPtr marker);
- [DllImport(&quot;gtksharpglue&quot;)]
+ [DllImport(&quot;glibsharpglue&quot;)]
static extern IntPtr gtksharp_slist_get_data (IntPtr l);
- [DllImport(&quot;gtksharpglue&quot;)]
+ [DllImport(&quot;glibsharpglue&quot;)]
static extern IntPtr gtksharp_slist_get_next (IntPtr l);
[DllImport(&quot;gtksourceview-1.0&quot;)]
Modified: trunk/MonoDevelop/src/Libraries/MonoDevelop.Gui.Widgets/Makefile.am
===================================================================
--- trunk/MonoDevelop/src/Libraries/MonoDevelop.Gui.Widgets/Makefile.am 2004-03-12 21:38:33 UTC (rev 1166)
+++ trunk/MonoDevelop/src/Libraries/MonoDevelop.Gui.Widgets/Makefile.am 2004-03-13 09:35:35 UTC (rev 1167)
@@ -13,11 +13,6 @@
./IconView/IconView.cs \
./AssemblyInfo.cs \
./FileBrowser/FileBrowser.cs \
-./PropertyGrid/PropertyGridWidget.cs \
-./PropertyGrid/ELabel.cs \
-./PropertyGrid/PropertyGridGroup.cs \
-./PropertyGrid/PropertyGridItem.cs \
-./PropertyGrid/PropertyGrid.cs \
./FolderDialog/FolderDialog.cs \
./FolderDialog/BaseFileEntry.cs \
./FolderDialog/FolderEntry.cs \
Modified: trunk/MonoDevelop/src/Libraries/MonoDevelop.Gui.Widgets/TabLabel/TabLabel.cs
===================================================================
--- trunk/MonoDevelop/src/Libraries/MonoDevelop.Gui.Widgets/TabLabel/TabLabel.cs 2004-03-12 21:38:33 UTC (rev 1166)
+++ trunk/MonoDevelop/src/Libraries/MonoDevelop.Gui.Widgets/TabLabel/TabLabel.cs 2004-03-13 09:35:35 UTC (rev 1167)
@@ -28,7 +28,13 @@
btn = new Button ();
btn.Add (new Gtk.Image (&quot;../data/resources/icons/MonoDevelop.Close.png&quot;));
btn.Relief = ReliefStyle.None;
- btn.RequestSize = new Size (16, 16);
+ //btn.RequestSize = new Size (16, 16);
+
+ //FIXME: When gtk# gets unbroken uncomment the line
+ //above, and remove the two below
+
+ btn.HeightRequest = 16;
+ btn.WidthRequest = 16;
this.PackStart (btn, true, true, 2);
this.ShowAll ();
Modified: trunk/MonoDevelop/src/Main/Base/Gui/Dialogs/CommonAboutDialog.cs
===================================================================
--- trunk/MonoDevelop/src/Main/Base/Gui/Dialogs/CommonAboutDialog.cs 2004-03-12 21:38:33 UTC (rev 1166)
+++ trunk/MonoDevelop/src/Main/Base/Gui/Dialogs/CommonAboutDialog.cs 2004-03-13 09:35:35 UTC (rev 1167)
@@ -46,7 +46,7 @@
public ScrollBox() : base (GType)
{
- this.RequestSize = new System.Drawing.Size (400, 220);
+ this.SetSizeRequest (400, 220);
this.Realized += new EventHandler (OnRealized);
this.ExposeEvent += new ExposeEventHandler (OnExposed);
@@ -99,7 +99,6 @@
protected void OnRealized (object o, EventArgs args)
{
layout = new Pango.Layout (this.PangoContext);
- Console.WriteLine (this.GdkWindow.Size);
// FIXME: this seems wrong but works
layout.Width = 253952;
layout.Wrap = Pango.WrapMode.Word;
@@ -136,7 +135,7 @@
this.VBox.PackStart (copyright, false, true, 0);
Notebook nb = new Notebook ();
- nb.RequestSize = new System.Drawing.Size (400, 280);
+ nb.SetSizeRequest (400, 280);
//nb.SwitchPage += new SwitchPageHandler (OnPageChanged);
//aatp = new AuthorAboutTabPage ();
//changelog = new ChangeLogTabPage ();
Modified: trunk/MonoDevelop/src/Main/Base/Gui/Dialogs/Wizard/StatusPanel.cs
===================================================================
--- trunk/MonoDevelop/src/Main/Base/Gui/Dialogs/Wizard/StatusPanel.cs 2004-03-12 21:38:33 UTC (rev 1166)
+++ trunk/MonoDevelop/src/Main/Base/Gui/Dialogs/Wizard/StatusPanel.cs 2004-03-13 09:35:35 UTC (rev 1167)
@@ -44,7 +44,7 @@
boldFont.Weight = Pango.Weight.Bold;
this.wizard = wizard;
- RequestSize = new Size (198, 400);
+ SetSizeRequest (198, 400);
bitmap = resourceService.GetBitmap (&quot;GeneralWizardBackground&quot;);
@@ -66,7 +66,9 @@
smallFont.Weight = Pango.Weight.Normal;
ly.FontDescription = smallFont;
ly.SetText (resourceService.GetString(&quot;SharpDevelop.Gui.Dialogs.WizardDialog.StepsLabel&quot;));
- int smallFontHeight = (int)(ly.Size.Height/1024.0f);
+ int lyWidth, lyHeight;
+ ly.GetSize (out lyWidth, out lyHeight);
+ int smallFontHeight = (int)(lyHeight/1024.0f);
GdkWindow.DrawLayout (gc, 10, 24 - smallFontHeight, ly);
GdkWindow.DrawLine(gc, 10, 24, WidthRequest - 10, 24);
Modified: trunk/MonoDevelop/src/Main/Base/Gui/Dialogs/Wizard/WizardDialog.cs
===================================================================
--- trunk/MonoDevelop/src/Main/Base/Gui/Dialogs/Wizard/WizardDialog.cs 2004-03-12 21:38:33 UTC (rev 1166)
+++ trunk/MonoDevelop/src/Main/Base/Gui/Dialogs/Wizard/WizardDialog.cs 2004-03-13 09:35:35 UTC (rev 1167)
@@ -185,7 +185,7 @@
// take out panel control &amp; show new one
if (dialogPanel.Child != null) {
- statusPanel.GdkWindow.InvalidateRect (new Rectangle (0, 0, 400, 400), true);
+ statusPanel.GdkWindow.InvalidateRect (new Gdk.Rectangle (0, 0, 400, 400), true);
dialogPanel.Remove (dialogPanel.Child);
}
if (CurrentWizardPane.ToString () == &quot;MonoDevelop.Gui.Dialogs.OptionPanels.CompletionDatabaseWizard.CreationFinishedPanel&quot;) {
Modified: trunk/MonoDevelop/src/Main/Base/Services/Tasks/Task.cs
===================================================================
--- trunk/MonoDevelop/src/Main/Base/Services/Tasks/Task.cs 2004-03-12 21:38:33 UTC (rev 1166)
+++ trunk/MonoDevelop/src/Main/Base/Services/Tasks/Task.cs 2004-03-13 09:35:35 UTC (rev 1167)
@@ -104,6 +104,7 @@
IFileService fileService = (IFileService)MonoDevelop.Core.Services.ServiceManager.Services.GetService(typeof(IFileService));
fileService.OpenFile(fileName);
IWorkbenchWindow window = fileService.GetOpenFile(fileName);
+ System.Threading.Thread.Sleep (50);
if (window == null) {
return;
}
Modified: trunk/MonoDevelop/src/Main/StartUp/Dialogs/ExceptionBox.cs
===================================================================
--- trunk/MonoDevelop/src/Main/StartUp/Dialogs/ExceptionBox.cs 2004-03-12 21:38:33 UTC (rev 1166)
+++ trunk/MonoDevelop/src/Main/StartUp/Dialogs/ExceptionBox.cs 2004-03-13 09:35:35 UTC (rev 1167)
@@ -130,30 +130,30 @@
// continueButton
//
this.continueButton.Label = &quot;Continue&quot;;
- this.continueButton.RequestSize = new System.Drawing.Size(112, 40);
+ this.continueButton.SetSizeRequest (112, 40);
this.continueButton.Clicked += new System.EventHandler(this.ContinueButton_Clicked);
//
// abortButton
//
this.abortButton.Label = &quot;Abort&quot;;
- this.abortButton.RequestSize = new System.Drawing.Size(112, 40);
+ this.abortButton.SetSizeRequest (112, 40);
this.abortButton.Clicked += new System.EventHandler(this.AbortButton_Clicked);
//
// ignoreButton
//
this.ignoreButton.Label = &quot;Ignore&quot;;
- this.ignoreButton.RequestSize = new System.Drawing.Size(112, 40);
+ this.ignoreButton.SetSizeRequest (112, 40);
this.ignoreButton.Clicked += new System.EventHandler(this.IgnoreButton_Clicked);
//
// copyErrorCheckButton
//
this.copyErrorCheckButton.Label = &quot;Copy error to clipboard&quot;;
- this.copyErrorCheckButton.RequestSize = new System.Drawing.Size(672, 24);
+ this.copyErrorCheckButton.SetSizeRequest (672, 24);
//
// includeSysInfoCheckButton
//
this.includeSysInfoCheckButton.Label = &quot;Include system info (Mono version, O.S. version)&quot;;
- this.copyErrorCheckButton.RequestSize = new System.Drawing.Size(672, 24);
+ this.copyErrorCheckButton.SetSizeRequest (672, 24);
//
// label
//
@@ -162,14 +162,14 @@
&quot;This may be due to a programming error.&quot; + System.Environment.NewLine +
&quot;Please, help us to make MonoDevelop a better program for everyone.&quot; + System.Environment.NewLine +
&quot;Thanks in advance for your help.&quot;;
- this.label.RequestSize = new System.Drawing.Size(480, 88);
+ this.label.SetSizeRequest (480, 88);
//
// scrolledwindow
//
this.scrolledwindow.HscrollbarPolicy = Gtk.PolicyType.Automatic;
this.scrolledwindow.VscrollbarPolicy = Gtk.PolicyType.Automatic;
this.scrolledwindow.AddWithViewport(this.exceptionTextView);
- this.scrolledwindow.RequestSize = new System.Drawing.Size(480, 256);
+ this.scrolledwindow.SetSizeRequest (480, 256);
//
// exceptionTextView
//
@@ -177,11 +177,11 @@
//
// image
//
- this.image.RequestSize = new System.Drawing.Size(226, 466);
+ this.image.SetSizeRequest (226, 466);
//
// fixedcontainer
//
- this.fixedcontainer.RequestSize = new System.Drawing.Size(740, 483);
+ this.fixedcontainer.SetSizeRequest (740, 483);
this.fixedcontainer.Put(continueButton, 624, 432);
this.fixedcontainer.Put(abortButton, 368, 432);
this.fixedcontainer.Put(ignoreButton, 496, 432);
</PRE>
<!--endarticle-->
<HR>
<P><UL>
<!--threads-->
<LI>Previous message: <A HREF="000772.html">[Monodevelop-patches-list] r1166 - trunk/MonoDevelop/src/Libraries/MonoDevelop.Gui.Widgets/Tree
</A></li>
<LI>Next message: <A HREF="000774.html">[Monodevelop-patches-list] r1168 - trunk/md-website
</A></li>
<LI> <B>Messages sorted by:</B>
<a href="date.html#773">[ date ]</a>
<a href="thread.html#773">[ thread ]</a>
<a href="subject.html#773">[ subject ]</a>
<a href="author.html#773">[ author ]</a>
</LI>
</UL>
<hr>
<a href="http://lists.ximian.com/mailman/listinfo/monodevelop-patches-list">More information about the Monodevelop-patches-list
mailing list</a><br>
</body></html>
Ссылка в новой задаче Показать git blame Копировать постоянную ссылку