[Monodevelop-patches-list] r1055 - in branches/MonoDevelop-playground: . gdldock/gdl gdldock/sources/gdl gtkmozembed-sharp libmonodevelop src/Plugins src/Plugins/Workbench src/StartUp
commit-watcher at mono-cvs.ximian.com
commit-watcher at mono-cvs.ximian.com
Sat Feb 28 13:41:12 EST 2004
Author: jzwart
Date: 2004-02-28 13:41:11 -0500 (Sat, 28 Feb 2004)
New Revision: 1055
Modified:
branches/MonoDevelop-playground/Makefile.am
branches/MonoDevelop-playground/configure.in
branches/MonoDevelop-playground/gdldock/gdl/Makefile.am
branches/MonoDevelop-playground/gdldock/sources/gdl/Makefile.am
branches/MonoDevelop-playground/gtkmozembed-sharp/Makefile.am
branches/MonoDevelop-playground/libmonodevelop/Makefile.am
branches/MonoDevelop-playground/monodevelop.in
branches/MonoDevelop-playground/src/Plugins/
branches/MonoDevelop-playground/src/Plugins/Workbench/
branches/MonoDevelop-playground/src/Plugins/Workbench/Workbench.cs
branches/MonoDevelop-playground/src/StartUp/
branches/MonoDevelop-playground/src/StartUp/monodevelop.exe.config.in
Log:
Workbench plugin now works and shows a window with menu-, tool- and statusbar on
startup. Disabled some more stuff in the build for now, and moved some stuff
around during make install ($prefix/bin, $prefix/lib and $prefix/lib/monodevelop
).
Modified: branches/MonoDevelop-playground/Makefile.am
===================================================================
--- branches/MonoDevelop-playground/Makefile.am 2004-02-28 10:04:10 UTC (rev 1054)
+++ branches/MonoDevelop-playground/Makefile.am 2004-02-28 18:41:11 UTC (rev 1055)
@@ -1,9 +1,13 @@
# leave gdldock first
# (mkdir ../../build/bin/ hack)
-SUBDIRS=gdldock libmonodevelop gtkmozembed-sharp src build data
+SUBDIRS=gdldock libmonodevelop gtkmozembed-sharp src
bin_SCRIPTS=monodevelop
+monodevelop: monodevelop.in
+ sed -e 's^\@bindir\@^$(bindir)^g' < $(srcdir)/monodevelop.in > monodevelop.tmp \
+ && mv monodevelop.tmp monodevelop
+
all:
gnome_data = @gnome_prefix@/share
Modified: branches/MonoDevelop-playground/configure.in
===================================================================
--- branches/MonoDevelop-playground/configure.in 2004-02-28 10:04:10 UTC (rev 1054)
+++ branches/MonoDevelop-playground/configure.in 2004-02-28 18:41:11 UTC (rev 1055)
@@ -62,6 +62,21 @@
gnome_prefix="`$PKG_CONFIG --variable=prefix libgnome-2.0`"
AC_SUBST(gnome_prefix)
+dnl Set PREFIX
+if test "x${prefix}" = "xNONE"; then
+ packageprefix=${ac_default_prefix}
+else
+ packageprefix=${prefix}
+fi
+
+# Set the path to the plugins directory so we don't litter $(prefix)/lib :-)
+monodevelop_plugin_dir="${packageprefix}/lib/monodevelop/plugins"
+AC_SUBST(monodevelop_plugin_dir)
+
+monodevelop_ui_dir="${packageprefix}/share/monodevelop/ui"
+AC_SUBST(monodevelop_ui_dir)
+
+
AC_OUTPUT([
Makefile
libmonodevelop/Makefile
Modified: branches/MonoDevelop-playground/gdldock/gdl/Makefile.am
===================================================================
--- branches/MonoDevelop-playground/gdldock/gdl/Makefile.am 2004-02-28 10:04:10 UTC (rev 1054)
+++ branches/MonoDevelop-playground/gdldock/gdl/Makefile.am 2004-02-28 18:41:11 UTC (rev 1055)
@@ -21,7 +21,7 @@
../../build/bin:
mkdir ../../build/bin
-gdldocklibdir = $(prefix)/lib/monodevelop/bin
+gdldocklibdir = $(prefix)/lib/
gdldocklib_DATA = $(ASSEMBLY)
clean:
Modified: branches/MonoDevelop-playground/gdldock/sources/gdl/Makefile.am
===================================================================
--- branches/MonoDevelop-playground/gdldock/sources/gdl/Makefile.am 2004-02-28 10:04:10 UTC (rev 1054)
+++ branches/MonoDevelop-playground/gdldock/sources/gdl/Makefile.am 2004-02-28 18:41:11 UTC (rev 1055)
@@ -113,7 +113,7 @@
&& cp xgen-gmc $(@F) \
&& rm -f xgen-gmc
-gdldocklibdir = $(prefix)/lib/monodevelop/bin
+gdldocklibdir = $(prefix)/lib/
gdldocklib_DATA = libgdldock.so stock-close-12.png \
stock-menu-left-12.png stock-menu-right-12.png
Modified: branches/MonoDevelop-playground/gtkmozembed-sharp/Makefile.am
===================================================================
--- branches/MonoDevelop-playground/gtkmozembed-sharp/Makefile.am 2004-02-28 10:04:10 UTC (rev 1054)
+++ branches/MonoDevelop-playground/gtkmozembed-sharp/Makefile.am 2004-02-28 18:41:11 UTC (rev 1055)
@@ -17,7 +17,7 @@
-r glib-sharp.dll -r gtk-sharp.dll -r gdk-sharp.dll \
--recurse '*.cs' -o $(ASSEMBLY)
-assemblydir = $(prefix)/lib/monodevelop/bin
+assemblydir = $(prefix)/lib
assembly_DATA = $(ASSEMBLY)
CLEANFILES=$(ASSEMBLY) generated-stamp generated
Modified: branches/MonoDevelop-playground/libmonodevelop/Makefile.am
===================================================================
--- branches/MonoDevelop-playground/libmonodevelop/Makefile.am 2004-02-28 10:04:10 UTC (rev 1054)
+++ branches/MonoDevelop-playground/libmonodevelop/Makefile.am 2004-02-28 18:41:11 UTC (rev 1055)
@@ -30,7 +30,7 @@
%.o: %.c
$(CC) $(CFLAGS) $(INCLUDES) -c $<
-monodeveloplibdir = $(prefix)/lib/monodevelop/bin
+monodeveloplibdir = $(prefix)/lib
monodeveloplib_DATA = libmonodevelop.so
clean:
Modified: branches/MonoDevelop-playground/monodevelop.in
===================================================================
--- branches/MonoDevelop-playground/monodevelop.in 2004-02-28 10:04:10 UTC (rev 1054)
+++ branches/MonoDevelop-playground/monodevelop.in 2004-02-28 18:41:11 UTC (rev 1055)
@@ -1,29 +1,27 @@
#!/bin/bash
-if test -n "$MOZILLA_FIVE_HOME"; then
- MOZILLA_HOME=$MOZILLA_FIVE_HOME
-elif [ -f @MOZILLA_HOME@/chrome/comm.jar ]; then
- MOZILLA_HOME=@MOZILLA_HOME@
-elif cat `which mozilla` | grep MOZILLA_FIVE_HOME=; then
- MOZILLA_HOME=$(cat $(which mozilla) | grep MOZILLA_FIVE_HOME= | cut -d '"' -f 2)
-else
- echo "Cannot find mozilla installation directory. Please set MOZILLA_FIVE_HOME to your mozilla directory"
- exit 1
-fi
+#if test -n "$MOZILLA_FIVE_HOME"; then
+# MOZILLA_HOME=$MOZILLA_FIVE_HOME
+#elif [ -f @MOZILLA_HOME@/chrome/comm.jar ]; then
+# MOZILLA_HOME=@MOZILLA_HOME@
+#elif cat `which mozilla` | grep MOZILLA_FIVE_HOME=; then
+# MOZILLA_HOME=cat `which mozilla` | grep MOZILLA_FIVE_HOME= | cut -d '"' -f 2
+#elif cat `which mozilla` | grep moz_libdir=; then
+# MOZILLA_HOME=cat `which mozilla` | grep moz_libdir= | cut -d '"' -f 2
+#else
+# echo "Cannot find mozilla installation directory. Please set MOZILLA_FIVE_HOME to your mozilla directory"
+# exit 1
+#fi
-GDLDOCKPATH=$(pwd)/build/bin
-
-LD_LIBRARY_PATH=$MOZILLA_HOME:$GDLDOCK_PATH:$LD_LIBRARY_PATH
-export LD_LIBRARY_PATH
+#LD_LIBRARY_PATH=$MOZILLA_HOME:$LD_LIBRARY_PATH
+#export LD_LIBRARY_PATH
-MOZILLA_FIVE_HOME=$MOZILLA_HOME
-export MOZILLA_FIVE_HOME
+#MOZILLA_FIVE_HOME=$MOZILLA_HOME
+#export MOZILLA_FIVE_HOME
-cd @prefix@/lib/monodevelop/bin
-
if test -n "$MD_NO_DBG"; then
FLAGS=$MD_MONO_FLAGS
else
FLAGS="$MD_MONO_FLAGS --debug"
fi
-mono $FLAGS ./MonoDevelop.exe $@
+ at bindir@/mono $FLAGS @bindir@/monodevelop.exe $@
Property changes on: branches/MonoDevelop-playground/src/Plugins
___________________________________________________________________
Name: svn:ignore
+ Makefile
Makefile.in
Property changes on: branches/MonoDevelop-playground/src/Plugins/Workbench
___________________________________________________________________
Name: svn:ignore
+ Makefile
Makefile.in
workbench.plugin
workbench.dll
Modified: branches/MonoDevelop-playground/src/Plugins/Workbench/Workbench.cs
===================================================================
--- branches/MonoDevelop-playground/src/Plugins/Workbench/Workbench.cs 2004-02-28 10:04:10 UTC (rev 1054)
+++ branches/MonoDevelop-playground/src/Plugins/Workbench/Workbench.cs 2004-02-28 18:41:11 UTC (rev 1055)
@@ -46,6 +46,7 @@
manager = new UIManager ();
manager.AddWidget += new AddWidgetHandler (OnWidgetAdd);
+ manager.ConnectProxy += new ConnectProxyHandler (OnProxyConnect);
AddActions ();
AddWidgets ();
@@ -59,32 +60,47 @@
private void AddActions ()
{
ActionGroup group = new ActionGroup ("Workbench");
+ Action action;
+
// File menu.
- group.Add (new ActionEntry ("FileMenuAction", null, "_File",
- null, null, null));
- group.Add (new ActionEntry ("CloseWindowAction", null,
- "Close _Window", "<control><shift>q",
- "Close this window",
- new GLib.Callback (OnCloseWindow)));
- group.Add (new ActionEntry ("QuitAction", Gtk.Stock.Quit, null,
- "<control>q", "Quit the program",
- new GLib.Callback (OnQuit)));
+ action = new Action ("FileMenuAction", "_File", null, null);
+ group.Add (action);
+
+ action = new Action ("CloseWindowAction", "Close _Window",
+ "Close this window", null);
+ action.Activated += new EventHandler (OnCloseWindow);
+ group.Add (action, "<control><shift>q");
+
+ action = new Action ("QuitAction", null, "Quit the program",
+ Gtk.Stock.Quit);
+ action.Activated += new EventHandler (OnQuit);
+ group.Add (action, "<control>q");
+
// View menu.
- group.Add (new ActionEntry ("ViewMenuAction", null, "_View",
- null, null, null));
+ action = new Action ("ViewMenuAction", "_View", null, null);
+ group.Add (action);
+
// Window menu.
- group.Add (new ActionEntry ("WindowMenuAction", null, "_Window",
- null, null, null));
- group.Add (new ActionEntry ("NewWindowAction", null, "_New Window",
- null, null, null));
+ action = new Action ("WindowMenuAction", "_Window", null,
+ null);
+ group.Add (action);
+
+ action = new Action ("NewWindowAction", "_New Window",
+ null, null);
+ group.Add (action);
+
// Help menu.
- group.Add (new ActionEntry ("HelpMenuAction", null, "_Help",
- null, null, null));
- group.Add (new ActionEntry ("AboutAction", Gnome.Stock.About,
- "_About", null, "About this application",
- new GLib.Callback (OnAbout)));
+ action = new Action ("HelpMenuAction", "_Help", null, null);
+ group.Add (action);
+
+ action = new Action ("AboutAction", "_About",
+ "About this application",
+ Gnome.Stock.About);
+ action.Activated += new EventHandler (OnAbout);
+ group.Add (action);
+
AddActionGroup (group);
- AddUiFromFile ("browser.ui");
+ AddUiFromFile ("workbench.ui");
}
private void AddWidgets ()
@@ -113,16 +129,16 @@
// Event handlers
////////////////////////////////////////////////////////////////////////
- private void OnCloseWindow (GLib.Object obj)
+ private void OnCloseWindow (object obj, EventArgs args)
{
}
- private void OnQuit (GLib.Object obj)
+ private void OnQuit (object obj, EventArgs args)
{
Application.Quit ();
}
- private void OnAbout (GLib.Object obj)
+ private void OnAbout (object obj, EventArgs args)
{
}
@@ -132,6 +148,27 @@
args.Widget.Show ();
}
+ private void OnProxyConnect (object obj, ConnectProxyArgs args)
+ {
+ if (args.Proxy is MenuItem) {
+ ((GLib.Object)args.Proxy).Data ["action"] = args.Action;
+ ((Item)args.Proxy).Selected += new EventHandler (OnSelect);
+ ((Item)args.Proxy).Deselected += new EventHandler (OnDeselect);
+ }
+ }
+
+ private void OnSelect (object obj, EventArgs args)
+ {
+ Action action = ((GLib.Object)obj).Data["action"] as Action;
+ if (action.Tooltip != null)
+ statusbar.Push (0, action.Tooltip);
+ }
+
+ private void OnDeselect (object obj, EventArgs args)
+ {
+ statusbar.Pop (0);
+ }
+
////////////////////////////////////////////////////////////////////////
// Static methods
////////////////////////////////////////////////////////////////////////
@@ -166,26 +203,6 @@
args.RetVal = true;
}
- static void OnSelect (object obj, EventArgs args)
- {
- Action action = ((GLib.Object)obj).Data["action"] as Action;
- ActiveBrowser.statusbar.Push (0, action.Tooltip);
- }
-
- static void OnDeselect (object obj, EventArgs args)
- {
- ActiveWorkbench.statusbar.Pop (0);
- }
-
- static void OnProxyConnected (object obj, AddWidgetArgs args)
- {
- if (args.Widget is MenuItem) {
- args.Widget.Data ["action"] = obj;
- ((Item)args.Widget).Selected += new EventHandler (OnSelect);
- ((Item)args.Widget).Deselected += new EventHandler (OnDeselect);
- }
- }
-
static Workbench ActiveWorkbench {
get {
return workbenches[0] as Workbench;
@@ -194,11 +211,6 @@
public static void AddActionGroup (ActionGroup group)
{
- // Register a ProxyConnected handler for displaying tooltips.
- foreach (Action action in group.ListActions ()) {
- action.ProxyConnected += new AddWidgetHandler (OnProxyConnected);
- }
-
groups.Add (group);
}
Property changes on: branches/MonoDevelop-playground/src/StartUp
___________________________________________________________________
Name: svn:ignore
- Makefile
Makefile.in
+ Makefile
Makefile.in
monodevelop.exe
monodevelop.exe.config
Modified: branches/MonoDevelop-playground/src/StartUp/monodevelop.exe.config.in
===================================================================
--- branches/MonoDevelop-playground/src/StartUp/monodevelop.exe.config.in 2004-02-28 10:04:10 UTC (rev 1054)
+++ branches/MonoDevelop-playground/src/StartUp/monodevelop.exe.config.in 2004-02-28 18:41:11 UTC (rev 1055)
@@ -1,8 +1,8 @@
<?xml version="1.0" encoding="utf-8" ?>
<configuration>
<appSettings>
- <add key="pluginsPath" value="@scaffold_plugin_dir@"/>
- <add key="uiPath" value="@scaffold_ui_dir@"/>
+ <add key="pluginsPath" value="@monodevelop_plugin_dir@"/>
+ <add key="uiPath" value="@monodevelop_ui_dir@"/>
</appSettings>
<configSections>
<section name="log4net" type="log4net.Config.Log4NetConfigurationSectionHandler, log4net"/>
More information about the Monodevelop-patches-list
mailing list