Do

Merge lp:~jassmith/do/docklets into lp:do

  1. docklets
  2. Merge into trunk
Proposed by Jason Smith
Status: Merged
Approved by: Alex Launi
Approved revision: 1149
Merged at revision: not available
Proposed branch: lp:~jassmith/do/docklets
Merge into: lp:do
Diff against target: None lines
To merge this branch: bzr merge lp:~jassmith/do/docklets
Reviewer Review Type Date Requested Status
Alex Launi (community) Approve
Review via email: mp+5765@code.launchpad.net
To post a comment you must log in.
Revision history for this message
Alex Launi (alexlauni) wrote :

swap declarations of drawing_area and setup in AnimationBaseConfigurationWidget.cs, you're also missing a space between the constructor and it's params. same with build, and remove the this.
move shadow_check.Active and animation_check.Active assignments to about the background_colorbutton property assignments.

in TrashDockItem.cs indent the predicate of that conditional

in DockyConfigurationWidget.cs switch the order of your using Docky.* statements. The SetSensativity method a) it's spelled Sensitivity b) it's ugly as hell, the indentations is messed up.

in OnZoomScaleValueChanged you can combine your first two checks to be
     if (setup || !(sender is HScale))

looks great aside from those couple of minor things.

review: Approve
lp:~jassmith/do/docklets updated
1150. By Jason Smith

Fix review issues

1151. By Jason Smith

Merge el trunko

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== added directory 'Do.Interface.Linux.AnimationBase'
2=== added file 'Do.Interface.Linux.AnimationBase/AssemblyInfo.cs'
3--- Do.Interface.Linux.AnimationBase/AssemblyInfo.cs 1970-01-01 00:00:00 +0000
4+++ Do.Interface.Linux.AnimationBase/AssemblyInfo.cs 2009-04-19 22:40:55 +0000
5@@ -0,0 +1,42 @@
6+//
7+// Copyright (C) 2009 GNOME Do
8+//
9+// This program is free software: you can redistribute it and/or modify
10+// it under the terms of the GNU General Public License as published by
11+// the Free Software Foundation, either version 3 of the License, or
12+// (at your option) any later version.
13+//
14+// This program is distributed in the hope that it will be useful,
15+// but WITHOUT ANY WARRANTY; without even the implied warranty of
16+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
17+// GNU General Public License for more details.
18+//
19+// You should have received a copy of the GNU General Public License
20+// along with this program. If not, see <http://www.gnu.org/licenses/>.
21+//
22+using System.Reflection;
23+using System.Runtime.CompilerServices;
24+
25+// Information about this assembly is defined by the following attributes.
26+// Change them to the values specific to your project.
27+
28+[assembly: AssemblyTitle("Do.Interface.Linux.AnimationBase")]
29+[assembly: AssemblyDescription("")]
30+[assembly: AssemblyConfiguration("")]
31+[assembly: AssemblyCompany("")]
32+[assembly: AssemblyProduct("")]
33+[assembly: AssemblyCopyright("")]
34+[assembly: AssemblyTrademark("")]
35+[assembly: AssemblyCulture("")]
36+
37+// The assembly version has the format "{Major}.{Minor}.{Build}.{Revision}".
38+// The form "{Major}.{Minor}.*" will automatically update the build and revision,
39+// and "{Major}.{Minor}.{Build}.*" will update just the revision.
40+
41+[assembly: AssemblyVersion("1.0.*")]
42+
43+// The following attributes are used to specify the signing key for the assembly,
44+// if desired. See the Mono documentation for more information about signing.
45+
46+[assembly: AssemblyDelaySign(false)]
47+[assembly: AssemblyKeyFile("")]
48
49=== added file 'Do.Interface.Linux.AnimationBase/Do.Interface.Linux.AnimationBase.mdp'
50--- Do.Interface.Linux.AnimationBase/Do.Interface.Linux.AnimationBase.mdp 1970-01-01 00:00:00 +0000
51+++ Do.Interface.Linux.AnimationBase/Do.Interface.Linux.AnimationBase.mdp 2009-04-20 04:00:45 +0000
52@@ -0,0 +1,54 @@
53+<Project name="Do.Interface.Linux.AnimationBase" fileversion="2.0" language="C#" targetFramework="3.5" ctype="DotNetProject">
54+ <Configurations active="Debug">
55+ <Configuration name="Debug" ctype="DotNetProjectConfiguration">
56+ <Output directory="bin/Debug" assembly="Do.Interface.Linux.AnimationBase" />
57+ <Build debugmode="True" target="Library" />
58+ <Execution runwithwarnings="True" consolepause="False" runtime="MsNet" />
59+ <CodeGeneration compiler="Mcs" warninglevel="4" optimize="False" unsafecodeallowed="False" generateoverflowchecks="False" definesymbols="DEBUG" generatexmldocumentation="False" ctype="CSharpCompilerParameters" />
60+ </Configuration>
61+ <Configuration name="Release" ctype="DotNetProjectConfiguration">
62+ <Output directory="bin/Release" assembly="Do.Interface.Linux.AnimationBase" />
63+ <Build debugmode="False" target="Library" />
64+ <Execution runwithwarnings="True" consolepause="False" runtime="MsNet" />
65+ <CodeGeneration compiler="Mcs" warninglevel="4" optimize="False" unsafecodeallowed="False" generateoverflowchecks="False" generatexmldocumentation="False" ctype="CSharpCompilerParameters" />
66+ </Configuration>
67+ </Configurations>
68+ <Contents>
69+ <File name="AssemblyInfo.cs" subtype="Code" buildaction="Compile" />
70+ <File name="src" subtype="Directory" buildaction="Compile" />
71+ <File name="Resources" subtype="Directory" buildaction="Compile" />
72+ <File name="Resources/Do.Interface.Linux.AnimationBase.addin.xml" subtype="Code" buildaction="Nothing" />
73+ <File name="src/Do.Interface" subtype="Directory" buildaction="Compile" />
74+ <File name="src/Do.Interface/Do.Interface.AnimationBase" subtype="Directory" buildaction="Compile" />
75+ <File name="src/Do.Interface/Do.Interface.AnimationBase/Bezel.cs" subtype="Code" buildaction="Compile" />
76+ <File name="src/Do.Interface/Do.Interface.AnimationBase/BezelColors.cs" subtype="Code" buildaction="Compile" />
77+ <File name="src/Do.Interface/Do.Interface.AnimationBase/BezelDefaults.cs" subtype="Code" buildaction="Compile" />
78+ <File name="src/Do.Interface/Do.Interface.AnimationBase/BezelDrawingArea.cs" subtype="Code" buildaction="Compile" />
79+ <File name="src/Do.Interface/Do.Interface.AnimationBase/BezelDrawingContext.cs" subtype="Code" buildaction="Compile" />
80+ <File name="src/Do.Interface/Do.Interface.AnimationBase/BezelGlassRenderClasses.cs" subtype="Code" buildaction="Compile" />
81+ <File name="src/Do.Interface/Do.Interface.AnimationBase/BezelGlassResults.cs" subtype="Code" buildaction="Compile" />
82+ <File name="src/Do.Interface/Do.Interface.AnimationBase/BezelGlassWindow.cs" subtype="Code" buildaction="Compile" />
83+ <File name="src/Do.Interface/Do.Interface.AnimationBase/BezelResultsDrawingArea.cs" subtype="Code" buildaction="Compile" />
84+ <File name="src/Do.Interface/Do.Interface.AnimationBase/IRenderInterfaces.cs" subtype="Code" buildaction="Compile" />
85+ <File name="src/Do.Interface/Do.Interface.AnimationBase/TextRenderer.cs" subtype="Code" buildaction="Compile" />
86+ <File name="src/Do.Interface/IRenderTheme.cs" subtype="Code" buildaction="Compile" />
87+ <File name="gtk-gui/gui.stetic" subtype="Code" buildaction="EmbedAsResource" />
88+ <File name="gtk-gui/generated.cs" subtype="Code" buildaction="Compile" />
89+ <File name="src/Do.Interface/Do.Interface.AnimationBase/AnimationBaseConfigurationWidget.cs" subtype="Code" buildaction="Compile" />
90+ <File name="gtk-gui/Do.Interface.AnimationBase.AnimationBaseConfigurationWidget.cs" subtype="Code" buildaction="Compile" />
91+ </Contents>
92+ <References>
93+ <ProjectReference type="Gac" localcopy="True" refto="System, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
94+ <ProjectReference type="Project" localcopy="True" refto="Do.Interface.Linux" />
95+ <ProjectReference type="Project" localcopy="True" refto="Do.Platform" />
96+ <ProjectReference type="Project" localcopy="True" refto="Do.Platform.Linux" />
97+ <ProjectReference type="Gac" localcopy="True" refto="System.Core, Version=3.5.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
98+ <ProjectReference type="Gac" localcopy="True" refto="Mono.Cairo, Version=2.0.0.0, Culture=neutral, PublicKeyToken=0738eb9f132ed756" />
99+ <ProjectReference type="Gac" localcopy="True" refto="glib-sharp, Version=2.12.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f" />
100+ <ProjectReference type="Gac" localcopy="True" refto="gtk-sharp, Version=2.12.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f" />
101+ <ProjectReference type="Gac" localcopy="True" refto="gdk-sharp, Version=2.12.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f" />
102+ <ProjectReference type="Gac" localcopy="True" refto="Mono.Posix, Version=2.0.0.0, Culture=neutral, PublicKeyToken=0738eb9f132ed756" />
103+ <ProjectReference type="Project" localcopy="True" refto="Do.Universe" />
104+ <ProjectReference type="Gac" localcopy="True" refto="gconf-sharp, Version=2.12.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f" />
105+ </References>
106+</Project>
107\ No newline at end of file
108
109=== added file 'Do.Interface.Linux.AnimationBase/Makefile.am'
110--- Do.Interface.Linux.AnimationBase/Makefile.am 1970-01-01 00:00:00 +0000
111+++ Do.Interface.Linux.AnimationBase/Makefile.am 2009-04-20 04:00:45 +0000
112@@ -0,0 +1,43 @@
113+# Simple component buildsystem
114+include $(top_srcdir)/build.rules.mk
115+
116+ASSEMBLY = Do.Interface.Linux.AnimationBase
117+TARGET = library
118+PKG_CONFIG_FILES = do.interface.linux.animationbase.pc
119+
120+FILES = \
121+ AssemblyInfo.cs \
122+ src/Do.Interface/IRenderTheme.cs \
123+ src/Do.Interface/Do.Interface.AnimationBase/AnimationBaseConfigurationWidget.cs \
124+ src/Do.Interface/Do.Interface.AnimationBase/Bezel.cs \
125+ src/Do.Interface/Do.Interface.AnimationBase/BezelColors.cs \
126+ src/Do.Interface/Do.Interface.AnimationBase/BezelDefaults.cs \
127+ src/Do.Interface/Do.Interface.AnimationBase/BezelDrawingArea.cs \
128+ src/Do.Interface/Do.Interface.AnimationBase/BezelDrawingContext.cs \
129+ src/Do.Interface/Do.Interface.AnimationBase/BezelGlassRenderClasses.cs \
130+ src/Do.Interface/Do.Interface.AnimationBase/BezelGlassResults.cs \
131+ src/Do.Interface/Do.Interface.AnimationBase/BezelGlassWindow.cs \
132+ src/Do.Interface/Do.Interface.AnimationBase/BezelResultsDrawingArea.cs \
133+ src/Do.Interface/Do.Interface.AnimationBase/IRenderInterfaces.cs \
134+ src/Do.Interface/Do.Interface.AnimationBase/TextRenderer.cs \
135+ gtk-gui/Do.Interface.AnimationBase.AnimationBaseConfigurationWidget.cs \
136+ gtk-gui/generated.cs
137+
138+
139+RESOURCES = \
140+ gtk-gui/gui.stetic \
141+ Resources/Do.Interface.Linux.AnimationBase.addin.xml
142+
143+REFERENCES = \
144+ System \
145+ System.Core \
146+ Mono.Cairo \
147+ Mono.Posix \
148+ $(GCONF_SHARP_20_LIBS) \
149+ $(GTK_SHARP_20_LIBS)
150+
151+PROJECT_REFERENCES = \
152+ Do.Platform.Linux \
153+ Do.Platform \
154+ Do.Interface.Linux \
155+ Do.Universe
156
157=== added directory 'Do.Interface.Linux.AnimationBase/Resources'
158=== added file 'Do.Interface.Linux.AnimationBase/Resources/Do.Interface.Linux.AnimationBase.addin.xml'
159--- Do.Interface.Linux.AnimationBase/Resources/Do.Interface.Linux.AnimationBase.addin.xml 1970-01-01 00:00:00 +0000
160+++ Do.Interface.Linux.AnimationBase/Resources/Do.Interface.Linux.AnimationBase.addin.xml 2009-04-20 04:00:45 +0000
161@@ -0,0 +1,10 @@
162+<Addin id="Interface.Linux.AnimationBase" namespace="Do" version="1.0">
163+
164+ <Runtime>
165+ <Import assembly="Do.Interface.Linux.AnimationBase.dll" />
166+ </Runtime>
167+
168+ <Dependencies>
169+ <Addin id="Interface.Linux" version="1.0" />
170+ </Dependencies>
171+</Addin>
172\ No newline at end of file
173
174=== added file 'Do.Interface.Linux.AnimationBase/do.interface.linux.animationbase.pc.in'
175--- Do.Interface.Linux.AnimationBase/do.interface.linux.animationbase.pc.in 1970-01-01 00:00:00 +0000
176+++ Do.Interface.Linux.AnimationBase/do.interface.linux.animationbase.pc.in 2009-04-20 00:12:53 +0000
177@@ -0,0 +1,6 @@
178+Name: Do.Interface.Linux.AnimationBase
179+Description: GTK+ Interface module for Do Animations
180+Version: @ABI_VERSION@
181+
182+Requires: do.interface.linux do.platform do.universe
183+Libs: -r:@expanded_libdir@/@PACKAGE@/Do.Interface.Linux.AnimationBase.dll
184
185=== added directory 'Do.Interface.Linux.AnimationBase/gtk-gui'
186=== added file 'Do.Interface.Linux.AnimationBase/gtk-gui/Do.Interface.AnimationBase.AnimationBaseConfigurationWidget.cs'
187--- Do.Interface.Linux.AnimationBase/gtk-gui/Do.Interface.AnimationBase.AnimationBaseConfigurationWidget.cs 1970-01-01 00:00:00 +0000
188+++ Do.Interface.Linux.AnimationBase/gtk-gui/Do.Interface.AnimationBase.AnimationBaseConfigurationWidget.cs 2009-04-20 04:00:45 +0000
189@@ -0,0 +1,133 @@
190+// ------------------------------------------------------------------------------
191+// <autogenerated>
192+// This code was generated by a tool.
193+//
194+//
195+// Changes to this file may cause incorrect behavior and will be lost if
196+// the code is regenerated.
197+// </autogenerated>
198+// ------------------------------------------------------------------------------
199+
200+namespace Do.Interface.AnimationBase {
201+
202+
203+ public partial class AnimationBaseConfigurationWidget {
204+
205+ private Gtk.VBox vbox4;
206+
207+ private Gtk.HBox hbox4;
208+
209+ private Gtk.Label label8;
210+
211+ private Gtk.ColorButton background_colorbutton;
212+
213+ private Gtk.Button clear_background;
214+
215+ private Gtk.CheckButton shadow_check;
216+
217+ private Gtk.CheckButton animation_check;
218+
219+ protected virtual void Build() {
220+ Stetic.Gui.Initialize(this);
221+ // Widget Do.Interface.AnimationBase.AnimationBaseConfigurationWidget
222+ Stetic.BinContainer.Attach(this);
223+ this.Name = "Do.Interface.AnimationBase.AnimationBaseConfigurationWidget";
224+ // Container child Do.Interface.AnimationBase.AnimationBaseConfigurationWidget.Gtk.Container+ContainerChild
225+ this.vbox4 = new Gtk.VBox();
226+ this.vbox4.Name = "vbox4";
227+ this.vbox4.Spacing = 6;
228+ // Container child vbox4.Gtk.Box+BoxChild
229+ this.hbox4 = new Gtk.HBox();
230+ this.hbox4.Name = "hbox4";
231+ this.hbox4.Spacing = 6;
232+ // Container child hbox4.Gtk.Box+BoxChild
233+ this.label8 = new Gtk.Label();
234+ this.label8.Name = "label8";
235+ this.label8.Xalign = 0F;
236+ this.label8.LabelProp = Mono.Unix.Catalog.GetString("Background Color:");
237+ this.hbox4.Add(this.label8);
238+ Gtk.Box.BoxChild w1 = ((Gtk.Box.BoxChild)(this.hbox4[this.label8]));
239+ w1.Position = 0;
240+ w1.Expand = false;
241+ w1.Fill = false;
242+ // Container child hbox4.Gtk.Box+BoxChild
243+ this.background_colorbutton = new Gtk.ColorButton();
244+ this.background_colorbutton.CanFocus = true;
245+ this.background_colorbutton.Events = ((Gdk.EventMask)(784));
246+ this.background_colorbutton.Name = "background_colorbutton";
247+ this.background_colorbutton.UseAlpha = true;
248+ this.background_colorbutton.Alpha = 65535;
249+ this.hbox4.Add(this.background_colorbutton);
250+ Gtk.Box.BoxChild w2 = ((Gtk.Box.BoxChild)(this.hbox4[this.background_colorbutton]));
251+ w2.Position = 1;
252+ w2.Expand = false;
253+ w2.Fill = false;
254+ // Container child hbox4.Gtk.Box+BoxChild
255+ this.clear_background = new Gtk.Button();
256+ this.clear_background.CanFocus = true;
257+ this.clear_background.Name = "clear_background";
258+ this.clear_background.UseUnderline = true;
259+ this.clear_background.Relief = ((Gtk.ReliefStyle)(2));
260+ // Container child clear_background.Gtk.Container+ContainerChild
261+ Gtk.Alignment w3 = new Gtk.Alignment(0.5F, 0.5F, 0F, 0F);
262+ // Container child GtkAlignment.Gtk.Container+ContainerChild
263+ Gtk.HBox w4 = new Gtk.HBox();
264+ w4.Spacing = 2;
265+ // Container child GtkHBox.Gtk.Container+ContainerChild
266+ Gtk.Image w5 = new Gtk.Image();
267+ w5.Pixbuf = Stetic.IconLoader.LoadIcon(this, "gtk-clear", Gtk.IconSize.Menu, 16);
268+ w4.Add(w5);
269+ // Container child GtkHBox.Gtk.Container+ContainerChild
270+ Gtk.Label w7 = new Gtk.Label();
271+ w7.LabelProp = Mono.Unix.Catalog.GetString("_Reset");
272+ w7.UseUnderline = true;
273+ w4.Add(w7);
274+ w3.Add(w4);
275+ this.clear_background.Add(w3);
276+ this.hbox4.Add(this.clear_background);
277+ Gtk.Box.BoxChild w11 = ((Gtk.Box.BoxChild)(this.hbox4[this.clear_background]));
278+ w11.Position = 2;
279+ w11.Expand = false;
280+ w11.Fill = false;
281+ this.vbox4.Add(this.hbox4);
282+ Gtk.Box.BoxChild w12 = ((Gtk.Box.BoxChild)(this.vbox4[this.hbox4]));
283+ w12.Position = 0;
284+ w12.Expand = false;
285+ w12.Fill = false;
286+ // Container child vbox4.Gtk.Box+BoxChild
287+ this.shadow_check = new Gtk.CheckButton();
288+ this.shadow_check.CanFocus = true;
289+ this.shadow_check.Name = "shadow_check";
290+ this.shadow_check.Label = Mono.Unix.Catalog.GetString("Show window shadow");
291+ this.shadow_check.DrawIndicator = true;
292+ this.shadow_check.UseUnderline = true;
293+ this.vbox4.Add(this.shadow_check);
294+ Gtk.Box.BoxChild w13 = ((Gtk.Box.BoxChild)(this.vbox4[this.shadow_check]));
295+ w13.Position = 1;
296+ w13.Expand = false;
297+ w13.Fill = false;
298+ // Container child vbox4.Gtk.Box+BoxChild
299+ this.animation_check = new Gtk.CheckButton();
300+ this.animation_check.CanFocus = true;
301+ this.animation_check.Name = "animation_check";
302+ this.animation_check.Label = Mono.Unix.Catalog.GetString("Animate window");
303+ this.animation_check.Active = true;
304+ this.animation_check.DrawIndicator = true;
305+ this.animation_check.UseUnderline = true;
306+ this.vbox4.Add(this.animation_check);
307+ Gtk.Box.BoxChild w14 = ((Gtk.Box.BoxChild)(this.vbox4[this.animation_check]));
308+ w14.Position = 2;
309+ w14.Expand = false;
310+ w14.Fill = false;
311+ this.Add(this.vbox4);
312+ if ((this.Child != null)) {
313+ this.Child.ShowAll();
314+ }
315+ this.Hide();
316+ this.background_colorbutton.ColorSet += new System.EventHandler(this.OnBackgroundColorbuttonColorSet);
317+ this.clear_background.Clicked += new System.EventHandler(this.OnClearBackgroundClicked);
318+ this.shadow_check.Toggled += new System.EventHandler(this.OnShadowCheckToggled);
319+ this.animation_check.Toggled += new System.EventHandler(this.OnAnimationCheckToggled);
320+ }
321+ }
322+}
323
324=== added file 'Do.Interface.Linux.AnimationBase/gtk-gui/generated.cs'
325--- Do.Interface.Linux.AnimationBase/gtk-gui/generated.cs 1970-01-01 00:00:00 +0000
326+++ Do.Interface.Linux.AnimationBase/gtk-gui/generated.cs 2009-04-20 04:00:45 +0000
327@@ -0,0 +1,115 @@
328+// ------------------------------------------------------------------------------
329+// <autogenerated>
330+// This code was generated by a tool.
331+//
332+//
333+// Changes to this file may cause incorrect behavior and will be lost if
334+// the code is regenerated.
335+// </autogenerated>
336+// ------------------------------------------------------------------------------
337+
338+namespace Stetic {
339+
340+
341+ internal class Gui {
342+
343+ private static bool initialized;
344+
345+ internal static void Initialize(Gtk.Widget iconRenderer) {
346+ if ((Stetic.Gui.initialized == false)) {
347+ Stetic.Gui.initialized = true;
348+ }
349+ }
350+ }
351+
352+ internal class BinContainer {
353+
354+ private Gtk.Widget child;
355+
356+ private Gtk.UIManager uimanager;
357+
358+ public static BinContainer Attach(Gtk.Bin bin) {
359+ BinContainer bc = new BinContainer();
360+ bin.SizeRequested += new Gtk.SizeRequestedHandler(bc.OnSizeRequested);
361+ bin.SizeAllocated += new Gtk.SizeAllocatedHandler(bc.OnSizeAllocated);
362+ bin.Added += new Gtk.AddedHandler(bc.OnAdded);
363+ return bc;
364+ }
365+
366+ private void OnSizeRequested(object sender, Gtk.SizeRequestedArgs args) {
367+ if ((this.child != null)) {
368+ args.Requisition = this.child.SizeRequest();
369+ }
370+ }
371+
372+ private void OnSizeAllocated(object sender, Gtk.SizeAllocatedArgs args) {
373+ if ((this.child != null)) {
374+ this.child.Allocation = args.Allocation;
375+ }
376+ }
377+
378+ private void OnAdded(object sender, Gtk.AddedArgs args) {
379+ this.child = args.Widget;
380+ }
381+
382+ public void SetUiManager(Gtk.UIManager uim) {
383+ this.uimanager = uim;
384+ this.child.Realized += new System.EventHandler(this.OnRealized);
385+ }
386+
387+ private void OnRealized(object sender, System.EventArgs args) {
388+ if ((this.uimanager != null)) {
389+ Gtk.Widget w;
390+ w = this.child.Toplevel;
391+ if (((w != null) && typeof(Gtk.Window).IsInstanceOfType(w))) {
392+ ((Gtk.Window)(w)).AddAccelGroup(this.uimanager.AccelGroup);
393+ this.uimanager = null;
394+ }
395+ }
396+ }
397+ }
398+
399+ internal class IconLoader {
400+
401+ public static Gdk.Pixbuf LoadIcon(Gtk.Widget widget, string name, Gtk.IconSize size, int sz) {
402+ Gdk.Pixbuf res = widget.RenderIcon(name, size, null);
403+ if ((res != null)) {
404+ return res;
405+ }
406+ else {
407+ try {
408+ return Gtk.IconTheme.Default.LoadIcon(name, sz, 0);
409+ }
410+ catch (System.Exception ) {
411+ if ((name != "gtk-missing-image")) {
412+ return Stetic.IconLoader.LoadIcon(widget, "gtk-missing-image", size, sz);
413+ }
414+ else {
415+ Gdk.Pixmap pmap = new Gdk.Pixmap(Gdk.Screen.Default.RootWindow, sz, sz);
416+ Gdk.GC gc = new Gdk.GC(pmap);
417+ gc.RgbFgColor = new Gdk.Color(255, 255, 255);
418+ pmap.DrawRectangle(gc, true, 0, 0, sz, sz);
419+ gc.RgbFgColor = new Gdk.Color(0, 0, 0);
420+ pmap.DrawRectangle(gc, false, 0, 0, (sz - 1), (sz - 1));
421+ gc.SetLineAttributes(3, Gdk.LineStyle.Solid, Gdk.CapStyle.Round, Gdk.JoinStyle.Round);
422+ gc.RgbFgColor = new Gdk.Color(255, 0, 0);
423+ pmap.DrawLine(gc, (sz / 4), (sz / 4), ((sz - 1) - (sz / 4)), ((sz - 1) - (sz / 4)));
424+ pmap.DrawLine(gc, ((sz - 1) - (sz / 4)), (sz / 4), (sz / 4), ((sz - 1) - (sz / 4)));
425+ return Gdk.Pixbuf.FromDrawable(pmap, pmap.Colormap, 0, 0, 0, 0, sz, sz);
426+ }
427+ }
428+ }
429+ }
430+ }
431+
432+ internal class ActionGroups {
433+
434+ public static Gtk.ActionGroup GetActionGroup(System.Type type) {
435+ return Stetic.ActionGroups.GetActionGroup(type.FullName);
436+ }
437+
438+ public static Gtk.ActionGroup GetActionGroup(string name) {
439+ return null;
440+ }
441+ }
442+}
443
444=== added file 'Do.Interface.Linux.AnimationBase/gtk-gui/gui.stetic'
445--- Do.Interface.Linux.AnimationBase/gtk-gui/gui.stetic 1970-01-01 00:00:00 +0000
446+++ Do.Interface.Linux.AnimationBase/gtk-gui/gui.stetic 2009-04-20 04:00:45 +0000
447@@ -0,0 +1,116 @@
448+<?xml version="1.0" encoding="utf-8"?>
449+<stetic-interface>
450+ <configuration>
451+ <images-root-path>..</images-root-path>
452+ <target-gtk-version>2.12</target-gtk-version>
453+ </configuration>
454+ <import>
455+ <widget-library name="../../Do.Interface.Linux/bin/Debug/Do.Interface.Linux.dll" />
456+ <widget-library name="../../Do.Platform.Linux/bin/Debug/Do.Platform.Linux.dll" />
457+ <widget-library name="../bin/Debug/Do.Interface.Linux.AnimationBase.dll" internal="true" />
458+ </import>
459+ <widget class="Gtk.Bin" id="Do.Interface.AnimationBase.AnimationBaseConfigurationWidget" design-size="300 87">
460+ <property name="MemberName" />
461+ <property name="Visible">False</property>
462+ <child>
463+ <widget class="Gtk.VBox" id="vbox4">
464+ <property name="MemberName" />
465+ <property name="Spacing">6</property>
466+ <child>
467+ <widget class="Gtk.HBox" id="hbox4">
468+ <property name="MemberName" />
469+ <property name="Spacing">6</property>
470+ <child>
471+ <widget class="Gtk.Label" id="label8">
472+ <property name="MemberName" />
473+ <property name="Xalign">0</property>
474+ <property name="LabelProp" translatable="yes">Background Color:</property>
475+ </widget>
476+ <packing>
477+ <property name="Position">0</property>
478+ <property name="AutoSize">True</property>
479+ <property name="Expand">False</property>
480+ <property name="Fill">False</property>
481+ </packing>
482+ </child>
483+ <child>
484+ <widget class="Gtk.ColorButton" id="background_colorbutton">
485+ <property name="MemberName" />
486+ <property name="CanFocus">True</property>
487+ <property name="Events">ButtonMotionMask, ButtonPressMask, ButtonReleaseMask</property>
488+ <property name="UseAlpha">True</property>
489+ <property name="Alpha">65535</property>
490+ <signal name="ColorSet" handler="OnBackgroundColorbuttonColorSet" />
491+ </widget>
492+ <packing>
493+ <property name="Position">1</property>
494+ <property name="AutoSize">True</property>
495+ <property name="Expand">False</property>
496+ <property name="Fill">False</property>
497+ </packing>
498+ </child>
499+ <child>
500+ <widget class="Gtk.Button" id="clear_background">
501+ <property name="MemberName" />
502+ <property name="CanFocus">True</property>
503+ <property name="Type">TextAndIcon</property>
504+ <property name="Icon">stock:gtk-clear Menu</property>
505+ <property name="Label" translatable="yes">_Reset</property>
506+ <property name="UseUnderline">True</property>
507+ <property name="Relief">None</property>
508+ <signal name="Clicked" handler="OnClearBackgroundClicked" />
509+ </widget>
510+ <packing>
511+ <property name="Position">2</property>
512+ <property name="AutoSize">True</property>
513+ <property name="Expand">False</property>
514+ <property name="Fill">False</property>
515+ </packing>
516+ </child>
517+ </widget>
518+ <packing>
519+ <property name="Position">0</property>
520+ <property name="AutoSize">True</property>
521+ <property name="Expand">False</property>
522+ <property name="Fill">False</property>
523+ </packing>
524+ </child>
525+ <child>
526+ <widget class="Gtk.CheckButton" id="shadow_check">
527+ <property name="MemberName" />
528+ <property name="CanFocus">True</property>
529+ <property name="Label" translatable="yes">Show window shadow</property>
530+ <property name="DrawIndicator">True</property>
531+ <property name="HasLabel">True</property>
532+ <property name="UseUnderline">True</property>
533+ <signal name="Toggled" handler="OnShadowCheckToggled" />
534+ </widget>
535+ <packing>
536+ <property name="Position">1</property>
537+ <property name="AutoSize">True</property>
538+ <property name="Expand">False</property>
539+ <property name="Fill">False</property>
540+ </packing>
541+ </child>
542+ <child>
543+ <widget class="Gtk.CheckButton" id="animation_check">
544+ <property name="MemberName" />
545+ <property name="CanFocus">True</property>
546+ <property name="Label" translatable="yes">Animate window</property>
547+ <property name="Active">True</property>
548+ <property name="DrawIndicator">True</property>
549+ <property name="HasLabel">True</property>
550+ <property name="UseUnderline">True</property>
551+ <signal name="Toggled" handler="OnAnimationCheckToggled" />
552+ </widget>
553+ <packing>
554+ <property name="Position">2</property>
555+ <property name="AutoSize">True</property>
556+ <property name="Expand">False</property>
557+ <property name="Fill">False</property>
558+ </packing>
559+ </child>
560+ </widget>
561+ </child>
562+ </widget>
563+</stetic-interface>
564\ No newline at end of file
565
566=== added directory 'Do.Interface.Linux.AnimationBase/src'
567=== added directory 'Do.Interface.Linux.AnimationBase/src/Do.Interface'
568=== added directory 'Do.Interface.Linux.AnimationBase/src/Do.Interface/Do.Interface.AnimationBase'
569=== added file 'Do.Interface.Linux.AnimationBase/src/Do.Interface/Do.Interface.AnimationBase/AnimationBaseConfigurationWidget.cs'
570--- Do.Interface.Linux.AnimationBase/src/Do.Interface/Do.Interface.AnimationBase/AnimationBaseConfigurationWidget.cs 1970-01-01 00:00:00 +0000
571+++ Do.Interface.Linux.AnimationBase/src/Do.Interface/Do.Interface.AnimationBase/AnimationBaseConfigurationWidget.cs 2009-04-20 04:00:45 +0000
572@@ -0,0 +1,83 @@
573+//
574+// Copyright (C) 2009 GNOME Do
575+//
576+// This program is free software: you can redistribute it and/or modify
577+// it under the terms of the GNU General Public License as published by
578+// the Free Software Foundation, either version 3 of the License, or
579+// (at your option) any later version.
580+//
581+// This program is distributed in the hope that it will be useful,
582+// but WITHOUT ANY WARRANTY; without even the implied warranty of
583+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
584+// GNU General Public License for more details.
585+//
586+// You should have received a copy of the GNU General Public License
587+// along with this program. If not, see <http://www.gnu.org/licenses/>.
588+//
589+
590+using System;
591+using System.Collections.Generic;
592+using System.Linq;
593+
594+using Gdk;
595+using Gtk;
596+using Cairo;
597+
598+using Do.Interface.CairoUtils;
599+
600+namespace Do.Interface.AnimationBase
601+{
602+
603+
604+ [System.ComponentModel.ToolboxItem(true)]
605+ public partial class AnimationBaseConfigurationWidget : Gtk.Bin
606+ {
607+ BezelDrawingArea drawing_area;
608+ bool setup = false;
609+
610+ public AnimationBaseConfigurationWidget(BezelDrawingArea drawingArea)
611+ {
612+ this.Build();
613+
614+ drawing_area = drawingArea;
615+ SetupButtons ();
616+ }
617+
618+ void SetupButtons ()
619+ {
620+ setup = true;
621+ background_colorbutton.Color = drawing_area.BackgroundColor.ConvertToGdk ();
622+ background_colorbutton.Alpha = (ushort) (drawing_area.BackgroundColor.A * ushort.MaxValue);
623+ shadow_check.Active = BezelDrawingArea.DrawShadow;
624+ animation_check.Active = BezelDrawingArea.Animated;
625+
626+ Gtk.Application.Invoke (delegate { setup = false; });
627+ }
628+
629+ protected virtual void OnShadowCheckToggled (object sender, System.EventArgs e)
630+ {
631+ if (setup) return;
632+ BezelDrawingArea.DrawShadow = shadow_check.Active;
633+ }
634+
635+ protected virtual void OnAnimationCheckToggled (object sender, System.EventArgs e)
636+ {
637+ if (setup) return;
638+ BezelDrawingArea.Animated = animation_check.Active;
639+ }
640+
641+ protected virtual void OnBackgroundColorbuttonColorSet (object sender, System.EventArgs e)
642+ {
643+ if (setup) return;
644+ string hex_string = string.Format ("{0}{1:X}", background_colorbutton.Color.ColorToHexString (), (byte) (background_colorbutton.Alpha >> 8));
645+ BezelDrawingArea.BgColor = hex_string;
646+ }
647+
648+ protected virtual void OnClearBackgroundClicked (object sender, System.EventArgs e)
649+ {
650+ BezelDrawingArea.ResetBackgroundStyle ();
651+ background_colorbutton.Color = drawing_area.BackgroundColor.ConvertToGdk ();
652+ background_colorbutton.Alpha = (ushort) (drawing_area.BackgroundColor.A * ushort.MaxValue);
653+ }
654+ }
655+}
656
657=== renamed file 'Do.Interface.Linux/src/Do.Interface/Do.Interface.AnimationBase/Bezel.cs' => 'Do.Interface.Linux.AnimationBase/src/Do.Interface/Do.Interface.AnimationBase/Bezel.cs'
658--- Do.Interface.Linux/src/Do.Interface/Do.Interface.AnimationBase/Bezel.cs 2009-01-07 21:41:05 +0000
659+++ Do.Interface.Linux.AnimationBase/src/Do.Interface/Do.Interface.AnimationBase/Bezel.cs 2009-04-20 04:00:45 +0000
660@@ -26,13 +26,14 @@
661
662 using Do.Universe;
663 using Do.Platform;
664+using Do.Platform.Linux;
665 using Do.Interface;
666
667 namespace Do.Interface.AnimationBase
668 {
669
670
671- public abstract class AbstractAnimatedInterface : Gtk.Window, IDoWindow
672+ public abstract class AbstractAnimatedInterface : Gtk.Window, IDoWindow, IConfigurable
673 {
674 BezelDrawingArea bezel_drawing_area;
675 BezelGlassResults bezel_glass_results;
676@@ -219,6 +220,26 @@
677 }
678 }
679
680+ #region IConfigurable implementation
681+ public Bin GetConfiguration ()
682+ {
683+ return new AnimationBaseConfigurationWidget (bezel_drawing_area);
684+ }
685+
686+ public string Description {
687+ get {
688+ return "Animated Interface Configuration";
689+ }
690+ }
691+
692+ public new string Icon {
693+ get {
694+ return "preferences";
695+ }
696+ }
697+ #endregion
698+
699+
700 public bool ResultsCanHide { get { return true; } }
701
702 public new event DoEventKeyDelegate KeyPressEvent;
703
704=== renamed file 'Do.Interface.Linux/src/Do.Interface/Do.Interface.AnimationBase/BezelColors.cs' => 'Do.Interface.Linux.AnimationBase/src/Do.Interface/Do.Interface.AnimationBase/BezelColors.cs'
705=== renamed file 'Do.Interface.Linux/src/Do.Interface/Do.Interface.AnimationBase/BezelDefaults.cs' => 'Do.Interface.Linux.AnimationBase/src/Do.Interface/Do.Interface.AnimationBase/BezelDefaults.cs'
706=== renamed file 'Do.Interface.Linux/src/Do.Interface/Do.Interface.AnimationBase/BezelDrawingArea.cs' => 'Do.Interface.Linux.AnimationBase/src/Do.Interface/Do.Interface.AnimationBase/BezelDrawingArea.cs'
707--- Do.Interface.Linux/src/Do.Interface/Do.Interface.AnimationBase/BezelDrawingArea.cs 2009-01-27 05:19:42 +0000
708+++ Do.Interface.Linux.AnimationBase/src/Do.Interface/Do.Interface.AnimationBase/BezelDrawingArea.cs 2009-04-20 04:00:45 +0000
709@@ -145,7 +145,6 @@
710 }
711 #endregion
712
713-#region LocalVariables
714 public const int TextHeight = 11;
715
716 HUDStyle style;
717@@ -184,10 +183,7 @@
718 bool[] entry_mode = new bool[3];
719
720 GConf.Client gconfClient;
721-#endregion
722
723-#region Properties
724-#region Box Format
725 public Cairo.Color BackgroundColor {
726 get {
727 Gdk.Color color = new Gdk.Color ();
728@@ -318,8 +314,7 @@
729 return (2 * WindowBorder - BorderWidth) + ((BoxWidth + BorderWidth) * 3) + 2 * ShadowRadius;
730 }
731 }
732-#endregion
733-#region Animation Properties
734+
735 private bool AnimationNeeded {
736 get {
737 return ExpandNeeded ||
738@@ -366,8 +361,7 @@
739 return window_fade != 1;
740 }
741 }
742-#endregion
743-#region Contexts
744+
745 private BezelDrawingContext Context {
746 get {
747 if (context == null)
748@@ -383,8 +377,7 @@
749 return old_context;
750 }
751 }
752-#endregion
753-#region Renderers
754+
755 public IBezelTitleBarRenderElement TitleBarRenderer {
756 get { return titleBarRenderer; }
757 }
758@@ -404,8 +397,6 @@
759 public IBezelDefaults BezelDefaults {
760 get { return bezelDefaults; }
761 }
762-#endregion
763-#endregion
764
765 public event EventHandler GtkThemeChanged;
766
767
768=== renamed file 'Do.Interface.Linux/src/Do.Interface/Do.Interface.AnimationBase/BezelDrawingContext.cs' => 'Do.Interface.Linux.AnimationBase/src/Do.Interface/Do.Interface.AnimationBase/BezelDrawingContext.cs'
769=== renamed file 'Do.Interface.Linux/src/Do.Interface/Do.Interface.AnimationBase/BezelGlassRenderClasses.cs' => 'Do.Interface.Linux.AnimationBase/src/Do.Interface/Do.Interface.AnimationBase/BezelGlassRenderClasses.cs'
770=== renamed file 'Do.Interface.Linux/src/Do.Interface/Do.Interface.AnimationBase/BezelGlassResults.cs' => 'Do.Interface.Linux.AnimationBase/src/Do.Interface/Do.Interface.AnimationBase/BezelGlassResults.cs'
771=== renamed file 'Do.Interface.Linux/src/Do.Interface/Do.Interface.AnimationBase/BezelGlassWindow.cs' => 'Do.Interface.Linux.AnimationBase/src/Do.Interface/Do.Interface.AnimationBase/BezelGlassWindow.cs'
772=== renamed file 'Do.Interface.Linux/src/Do.Interface/Do.Interface.AnimationBase/BezelResultsDrawingArea.cs' => 'Do.Interface.Linux.AnimationBase/src/Do.Interface/Do.Interface.AnimationBase/BezelResultsDrawingArea.cs'
773=== renamed file 'Do.Interface.Linux/src/Do.Interface/Do.Interface.AnimationBase/IRenderInterfaces.cs' => 'Do.Interface.Linux.AnimationBase/src/Do.Interface/Do.Interface.AnimationBase/IRenderInterfaces.cs'
774=== renamed file 'Do.Interface.Linux/src/Do.Interface/Do.Interface.AnimationBase/TextRenderer.cs' => 'Do.Interface.Linux.AnimationBase/src/Do.Interface/Do.Interface.AnimationBase/TextRenderer.cs'
775=== renamed file 'Do.Interface.Linux/src/Do.Interface/IRenderTheme.cs' => 'Do.Interface.Linux.AnimationBase/src/Do.Interface/IRenderTheme.cs'
776=== modified file 'Do.Interface.Linux.Classic/Do.Interface.Linux.Classic.mdp'
777--- Do.Interface.Linux.Classic/Do.Interface.Linux.Classic.mdp 2009-01-27 03:23:24 +0000
778+++ Do.Interface.Linux.Classic/Do.Interface.Linux.Classic.mdp 2009-04-20 00:12:53 +0000
779@@ -1,10 +1,10 @@
780-<Project name="Do.Interface.Linux.Classic" fileversion="2.0" language="C#" clr-version="Net_2_0" targetFramework="2.0" ctype="DotNetProject">
781+<Project name="Do.Interface.Linux.Classic" fileversion="2.0" language="C#" clr-version="Net_2_0" targetFramework="3.5" ctype="DotNetProject">
782 <Configurations active="Debug">
783 <Configuration name="Debug" ctype="DotNetProjectConfiguration">
784 <Output directory="bin/Debug" assembly="Do.Interface.Linux.Classic" />
785 <Build debugmode="True" target="Library" />
786 <Execution runwithwarnings="True" consolepause="False" runtime="MsNet" clr-version="Net_2_0" />
787- <CodeGeneration compiler="Mcs" warninglevel="4" optimize="False" unsafecodeallowed="False" generateoverflowchecks="False" definesymbols="DEBUG" generatexmldocumentation="False" ctype="CSharpCompilerParameters" />
788+ <CodeGeneration compiler="Mcs" warninglevel="4" optimize="True" unsafecodeallowed="False" generateoverflowchecks="True" definesymbols="DEBUG" generatexmldocumentation="False" ctype="CSharpCompilerParameters" />
789 </Configuration>
790 <Configuration name="Release" ctype="DotNetProjectConfiguration">
791 <Output directory="bin/Release" assembly="Do.Interface.Linux.Classic" />
792@@ -31,5 +31,6 @@
793 <ProjectReference type="Gac" localcopy="True" refto="Mono.Cairo, Version=2.0.0.0, Culture=neutral, PublicKeyToken=0738eb9f132ed756" />
794 <ProjectReference type="Gac" localcopy="True" refto="System.Core, Version=3.5.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
795 <ProjectReference type="Gac" localcopy="True" refto="Mono.Posix, Version=2.0.0.0, Culture=neutral, PublicKeyToken=0738eb9f132ed756" />
796+ <ProjectReference type="Project" localcopy="True" refto="Do.Interface.Linux.AnimationBase" />
797 </References>
798 </Project>
799\ No newline at end of file
800
801=== modified file 'Do.Interface.Linux.Classic/Makefile.am'
802--- Do.Interface.Linux.Classic/Makefile.am 2008-12-15 22:25:09 +0000
803+++ Do.Interface.Linux.Classic/Makefile.am 2009-04-20 00:15:20 +0000
804@@ -21,4 +21,5 @@
805
806 PROJECT_REFERENCES = \
807 Do.Interface.Linux \
808+ Do.Interface.Linux.AnimationBase \
809 Do.Platform
810
811=== modified file 'Do.Interface.Linux.Docky/Do.Interface.Linux.Docky.mdp'
812--- Do.Interface.Linux.Docky/Do.Interface.Linux.Docky.mdp 2009-04-18 03:12:46 +0000
813+++ Do.Interface.Linux.Docky/Do.Interface.Linux.Docky.mdp 2009-04-20 04:49:28 +0000
814@@ -1,11 +1,11 @@
815-<Project name="Do.Interface.Linux.Docky" fileversion="2.0" language="C#" DefaultNamespace="Docky" clr-version="Net_2_0" targetFramework="2.0" ctype="DotNetProject">
816+<Project name="Do.Interface.Linux.Docky" fileversion="2.0" language="C#" DefaultNamespace="Docky" clr-version="Net_2_0" targetFramework="3.5" ctype="DotNetProject">
817 <Configurations active="Debug">
818 <Configuration name="Debug" ctype="DotNetProjectConfiguration">
819 <Output directory="bin/Debug" assembly="Do.Interface.Linux.Docky" />
820 <Build debugmode="True" target="Library" />
821 <Execution runwithwarnings="True" consolepause="False" runtime="MsNet" clr-version="Net_2_0" />
822 <EnvironmentVariables />
823- <CodeGeneration compiler="Mcs" warninglevel="4" optimize="False" unsafecodeallowed="False" generateoverflowchecks="False" generatexmldocumentation="False" ctype="CSharpCompilerParameters" />
824+ <CodeGeneration compiler="Mcs" warninglevel="4" optimize="True" unsafecodeallowed="False" generateoverflowchecks="True" generatexmldocumentation="False" ctype="CSharpCompilerParameters" />
825 </Configuration>
826 <Configuration name="Release" ctype="DotNetProjectConfiguration">
827 <Output directory="bin/Release" assembly="Do.Interface.Linux.Docky" />
828@@ -86,6 +86,10 @@
829 <File name="src/Docky.Interface/Docky.Interface.Menus/AbstractMenuArgs.cs" subtype="Code" buildaction="Compile" />
830 <File name="src/Docky.Interface/Docky.Interface.Menus/WidgetMenuArgs.cs" subtype="Code" buildaction="Compile" />
831 <File name="src/Docky.Interface/TextRenderContext.cs" subtype="Code" buildaction="Compile" />
832+ <File name="gtk-gui/gui.stetic" subtype="Code" buildaction="EmbedAsResource" />
833+ <File name="gtk-gui/generated.cs" subtype="Code" buildaction="Compile" />
834+ <File name="src/Docky.Interface/DockyConfigurationWidget.cs" subtype="Code" buildaction="Compile" />
835+ <File name="gtk-gui/Docky.Interface.DockyConfigurationWidget.cs" subtype="Code" buildaction="Compile" />
836 </Contents>
837 <References>
838 <ProjectReference type="Gac" localcopy="True" refto="System, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
839@@ -100,8 +104,10 @@
840 <ProjectReference type="Project" localcopy="True" refto="Do.Platform" />
841 <ProjectReference type="Project" localcopy="True" refto="Do.Universe" />
842 <ProjectReference type="Gac" localcopy="True" refto="gnomedesktop-sharp, Version=2.20.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f" />
843- <ProjectReference type="Gac" localcopy="True" refto="gnome-vfs-sharp, Version=2.12.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f" />
844 <ProjectReference type="Gac" localcopy="True" refto="rsvg2-sharp, Version=2.18.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f" />
845 <ProjectReference type="Gac" localcopy="True" refto="Mono.Addins, Version=0.3.0.0, Culture=neutral, PublicKeyToken=0738eb9f132ed756" />
846+ <ProjectReference type="Project" localcopy="True" refto="Do.Interface.Wink" />
847+ <ProjectReference type="Project" localcopy="True" refto="Do.Platform.Linux" />
848+ <ProjectReference type="Project" localcopy="True" refto="Do.Interface.Linux.AnimationBase" />
849 </References>
850 </Project>
851\ No newline at end of file
852
853=== modified file 'Do.Interface.Linux.Docky/Makefile.am'
854--- Do.Interface.Linux.Docky/Makefile.am 2009-04-18 03:12:46 +0000
855+++ Do.Interface.Linux.Docky/Makefile.am 2009-04-20 04:49:28 +0000
856@@ -7,6 +7,8 @@
857 PKG_CONFIG_FILES = do.interface.linux.docky.pc
858
859 FILES = \
860+ gtk-gui/Docky.Interface.DockyConfigurationWidget.cs \
861+ gtk-gui/generated.cs \
862 AssemblyInfo.cs \
863 src/Docky.Core/DockServices.cs \
864 src/Docky.Core/IDockletService.cs \
865@@ -25,6 +27,7 @@
866 src/Docky.Interface/DockArea_Rendering.cs \
867 src/Docky.Interface/DockArea_DragAndDrop.cs \
868 src/Docky.Interface/DockAnimationState.cs \
869+ src/Docky.Interface/DockyConfigurationWidget.cs \
870 src/Docky.Interface/DoInteropService.cs \
871 src/Docky.Interface/Docky.Interface.Items/AbstractDockItem.cs \
872 src/Docky.Interface/Docky.Interface.Items/AbstractDockletItem.cs \
873@@ -70,6 +73,7 @@
874 src/Docky.Utilities/GtkUtils.cs
875
876 RESOURCES = \
877+ gtk-gui/gui.stetic \
878 Resources/Do.Interface.Linux.Docky.addin.xml \
879 Resources/close.svg \
880 Resources/run.svg \
881@@ -91,4 +95,6 @@
882 Do.Interface.Linux \
883 Do.Interface.Wink \
884 Do.Platform \
885+ Do.Platform.Linux \
886+ Do.Interface.Linux.AnimationBase \
887 Do.Universe
888
889=== added directory 'Do.Interface.Linux.Docky/gtk-gui'
890=== added file 'Do.Interface.Linux.Docky/gtk-gui/Docky.Interface.DockyConfigurationWidget.cs'
891--- Do.Interface.Linux.Docky/gtk-gui/Docky.Interface.DockyConfigurationWidget.cs 1970-01-01 00:00:00 +0000
892+++ Do.Interface.Linux.Docky/gtk-gui/Docky.Interface.DockyConfigurationWidget.cs 2009-04-21 02:15:39 +0000
893@@ -0,0 +1,251 @@
894+// ------------------------------------------------------------------------------
895+// <autogenerated>
896+// This code was generated by a tool.
897+//
898+//
899+// Changes to this file may cause incorrect behavior and will be lost if
900+// the code is regenerated.
901+// </autogenerated>
902+// ------------------------------------------------------------------------------
903+
904+namespace Docky.Interface {
905+
906+
907+ public partial class DockyConfigurationWidget {
908+
909+ private Gtk.VBox vbox2;
910+
911+ private Gtk.HBox hbox5;
912+
913+ private Gtk.Label orientation_label;
914+
915+ private Gtk.ComboBox orientation_combobox;
916+
917+ private Gtk.HBox hbox8;
918+
919+ private Gtk.CheckButton autohide_checkbutton;
920+
921+ private Gtk.CheckButton window_overlap_checkbutton;
922+
923+ private Gtk.HBox hbox9;
924+
925+ private Gtk.CheckButton zoom_checkbutton;
926+
927+ private Gtk.CheckButton advanced_indicators_checkbutton;
928+
929+ private Gtk.HBox hbox6;
930+
931+ private Gtk.Label zoom_size_label;
932+
933+ private Gtk.HScale zoom_scale;
934+
935+ private Gtk.HBox hbox7;
936+
937+ private Gtk.Label zoom_width_label;
938+
939+ private Gtk.HScale zoom_width_scale;
940+
941+ private Gtk.Label label5;
942+
943+ private Gtk.ScrolledWindow scrolled_window;
944+
945+ protected virtual void Build() {
946+ Stetic.Gui.Initialize(this);
947+ // Widget Docky.Interface.DockyConfigurationWidget
948+ Stetic.BinContainer.Attach(this);
949+ this.Name = "Docky.Interface.DockyConfigurationWidget";
950+ // Container child Docky.Interface.DockyConfigurationWidget.Gtk.Container+ContainerChild
951+ this.vbox2 = new Gtk.VBox();
952+ this.vbox2.Name = "vbox2";
953+ this.vbox2.Spacing = 6;
954+ // Container child vbox2.Gtk.Box+BoxChild
955+ this.hbox5 = new Gtk.HBox();
956+ this.hbox5.Name = "hbox5";
957+ this.hbox5.Spacing = 6;
958+ // Container child hbox5.Gtk.Box+BoxChild
959+ this.orientation_label = new Gtk.Label();
960+ this.orientation_label.Name = "orientation_label";
961+ this.orientation_label.LabelProp = Mono.Unix.Catalog.GetString("Orientation:");
962+ this.hbox5.Add(this.orientation_label);
963+ Gtk.Box.BoxChild w1 = ((Gtk.Box.BoxChild)(this.hbox5[this.orientation_label]));
964+ w1.Position = 0;
965+ w1.Expand = false;
966+ w1.Fill = false;
967+ // Container child hbox5.Gtk.Box+BoxChild
968+ this.orientation_combobox = Gtk.ComboBox.NewText();
969+ this.orientation_combobox.Name = "orientation_combobox";
970+ this.hbox5.Add(this.orientation_combobox);
971+ Gtk.Box.BoxChild w2 = ((Gtk.Box.BoxChild)(this.hbox5[this.orientation_combobox]));
972+ w2.Position = 1;
973+ w2.Expand = false;
974+ w2.Fill = false;
975+ this.vbox2.Add(this.hbox5);
976+ Gtk.Box.BoxChild w3 = ((Gtk.Box.BoxChild)(this.vbox2[this.hbox5]));
977+ w3.Position = 0;
978+ w3.Expand = false;
979+ w3.Fill = false;
980+ // Container child vbox2.Gtk.Box+BoxChild
981+ this.hbox8 = new Gtk.HBox();
982+ this.hbox8.Name = "hbox8";
983+ this.hbox8.Homogeneous = true;
984+ this.hbox8.Spacing = 6;
985+ // Container child hbox8.Gtk.Box+BoxChild
986+ this.autohide_checkbutton = new Gtk.CheckButton();
987+ this.autohide_checkbutton.CanFocus = true;
988+ this.autohide_checkbutton.Name = "autohide_checkbutton";
989+ this.autohide_checkbutton.Label = Mono.Unix.Catalog.GetString("Automatically Hide");
990+ this.autohide_checkbutton.DrawIndicator = true;
991+ this.autohide_checkbutton.UseUnderline = true;
992+ this.hbox8.Add(this.autohide_checkbutton);
993+ Gtk.Box.BoxChild w4 = ((Gtk.Box.BoxChild)(this.hbox8[this.autohide_checkbutton]));
994+ w4.Position = 0;
995+ // Container child hbox8.Gtk.Box+BoxChild
996+ this.window_overlap_checkbutton = new Gtk.CheckButton();
997+ this.window_overlap_checkbutton.CanFocus = true;
998+ this.window_overlap_checkbutton.Name = "window_overlap_checkbutton";
999+ this.window_overlap_checkbutton.Label = Mono.Unix.Catalog.GetString("Allow Window Overlap");
1000+ this.window_overlap_checkbutton.DrawIndicator = true;
1001+ this.window_overlap_checkbutton.UseUnderline = true;
1002+ this.hbox8.Add(this.window_overlap_checkbutton);
1003+ Gtk.Box.BoxChild w5 = ((Gtk.Box.BoxChild)(this.hbox8[this.window_overlap_checkbutton]));
1004+ w5.Position = 1;
1005+ this.vbox2.Add(this.hbox8);
1006+ Gtk.Box.BoxChild w6 = ((Gtk.Box.BoxChild)(this.vbox2[this.hbox8]));
1007+ w6.Position = 1;
1008+ w6.Expand = false;
1009+ w6.Fill = false;
1010+ // Container child vbox2.Gtk.Box+BoxChild
1011+ this.hbox9 = new Gtk.HBox();
1012+ this.hbox9.Name = "hbox9";
1013+ this.hbox9.Homogeneous = true;
1014+ this.hbox9.Spacing = 6;
1015+ // Container child hbox9.Gtk.Box+BoxChild
1016+ this.zoom_checkbutton = new Gtk.CheckButton();
1017+ this.zoom_checkbutton.CanFocus = true;
1018+ this.zoom_checkbutton.Name = "zoom_checkbutton";
1019+ this.zoom_checkbutton.Label = Mono.Unix.Catalog.GetString("Enable Zoom");
1020+ this.zoom_checkbutton.DrawIndicator = true;
1021+ this.zoom_checkbutton.UseUnderline = true;
1022+ this.hbox9.Add(this.zoom_checkbutton);
1023+ Gtk.Box.BoxChild w7 = ((Gtk.Box.BoxChild)(this.hbox9[this.zoom_checkbutton]));
1024+ w7.Position = 0;
1025+ // Container child hbox9.Gtk.Box+BoxChild
1026+ this.advanced_indicators_checkbutton = new Gtk.CheckButton();
1027+ this.advanced_indicators_checkbutton.CanFocus = true;
1028+ this.advanced_indicators_checkbutton.Name = "advanced_indicators_checkbutton";
1029+ this.advanced_indicators_checkbutton.Label = Mono.Unix.Catalog.GetString("Indicate Multiple Windows");
1030+ this.advanced_indicators_checkbutton.DrawIndicator = true;
1031+ this.advanced_indicators_checkbutton.UseUnderline = true;
1032+ this.hbox9.Add(this.advanced_indicators_checkbutton);
1033+ Gtk.Box.BoxChild w8 = ((Gtk.Box.BoxChild)(this.hbox9[this.advanced_indicators_checkbutton]));
1034+ w8.Position = 1;
1035+ this.vbox2.Add(this.hbox9);
1036+ Gtk.Box.BoxChild w9 = ((Gtk.Box.BoxChild)(this.vbox2[this.hbox9]));
1037+ w9.Position = 2;
1038+ w9.Expand = false;
1039+ w9.Fill = false;
1040+ // Container child vbox2.Gtk.Box+BoxChild
1041+ this.hbox6 = new Gtk.HBox();
1042+ this.hbox6.Name = "hbox6";
1043+ this.hbox6.Spacing = 6;
1044+ // Container child hbox6.Gtk.Box+BoxChild
1045+ this.zoom_size_label = new Gtk.Label();
1046+ this.zoom_size_label.Name = "zoom_size_label";
1047+ this.zoom_size_label.Yalign = 0.83F;
1048+ this.zoom_size_label.LabelProp = Mono.Unix.Catalog.GetString("Zoom Size");
1049+ this.hbox6.Add(this.zoom_size_label);
1050+ Gtk.Box.BoxChild w10 = ((Gtk.Box.BoxChild)(this.hbox6[this.zoom_size_label]));
1051+ w10.Position = 0;
1052+ w10.Expand = false;
1053+ w10.Fill = false;
1054+ // Container child hbox6.Gtk.Box+BoxChild
1055+ this.zoom_scale = new Gtk.HScale(null);
1056+ this.zoom_scale.CanFocus = true;
1057+ this.zoom_scale.Name = "zoom_scale";
1058+ this.zoom_scale.UpdatePolicy = ((Gtk.UpdateType)(1));
1059+ this.zoom_scale.Adjustment.Lower = 0.1;
1060+ this.zoom_scale.Adjustment.Upper = 4;
1061+ this.zoom_scale.Adjustment.PageIncrement = 0.1;
1062+ this.zoom_scale.Adjustment.PageSize = 0.1;
1063+ this.zoom_scale.Adjustment.StepIncrement = 0.1;
1064+ this.zoom_scale.Adjustment.Value = 0.7;
1065+ this.zoom_scale.DrawValue = true;
1066+ this.zoom_scale.Digits = 0;
1067+ this.zoom_scale.ValuePos = ((Gtk.PositionType)(2));
1068+ this.hbox6.Add(this.zoom_scale);
1069+ Gtk.Box.BoxChild w11 = ((Gtk.Box.BoxChild)(this.hbox6[this.zoom_scale]));
1070+ w11.Position = 1;
1071+ this.vbox2.Add(this.hbox6);
1072+ Gtk.Box.BoxChild w12 = ((Gtk.Box.BoxChild)(this.vbox2[this.hbox6]));
1073+ w12.Position = 3;
1074+ w12.Expand = false;
1075+ w12.Fill = false;
1076+ // Container child vbox2.Gtk.Box+BoxChild
1077+ this.hbox7 = new Gtk.HBox();
1078+ this.hbox7.Name = "hbox7";
1079+ this.hbox7.Spacing = 6;
1080+ // Container child hbox7.Gtk.Box+BoxChild
1081+ this.zoom_width_label = new Gtk.Label();
1082+ this.zoom_width_label.Name = "zoom_width_label";
1083+ this.zoom_width_label.Yalign = 0.83F;
1084+ this.zoom_width_label.LabelProp = Mono.Unix.Catalog.GetString("Zoom Width");
1085+ this.hbox7.Add(this.zoom_width_label);
1086+ Gtk.Box.BoxChild w13 = ((Gtk.Box.BoxChild)(this.hbox7[this.zoom_width_label]));
1087+ w13.Position = 0;
1088+ w13.Expand = false;
1089+ w13.Fill = false;
1090+ // Container child hbox7.Gtk.Box+BoxChild
1091+ this.zoom_width_scale = new Gtk.HScale(null);
1092+ this.zoom_width_scale.CanFocus = true;
1093+ this.zoom_width_scale.Name = "zoom_width_scale";
1094+ this.zoom_width_scale.UpdatePolicy = ((Gtk.UpdateType)(1));
1095+ this.zoom_width_scale.Adjustment.Upper = 100;
1096+ this.zoom_width_scale.Adjustment.PageIncrement = 10;
1097+ this.zoom_width_scale.Adjustment.PageSize = 10;
1098+ this.zoom_width_scale.Adjustment.StepIncrement = 10;
1099+ this.zoom_width_scale.Adjustment.Value = 81;
1100+ this.zoom_width_scale.DrawValue = true;
1101+ this.zoom_width_scale.Digits = 0;
1102+ this.zoom_width_scale.ValuePos = ((Gtk.PositionType)(2));
1103+ this.hbox7.Add(this.zoom_width_scale);
1104+ Gtk.Box.BoxChild w14 = ((Gtk.Box.BoxChild)(this.hbox7[this.zoom_width_scale]));
1105+ w14.Position = 1;
1106+ this.vbox2.Add(this.hbox7);
1107+ Gtk.Box.BoxChild w15 = ((Gtk.Box.BoxChild)(this.vbox2[this.hbox7]));
1108+ w15.Position = 4;
1109+ w15.Expand = false;
1110+ w15.Fill = false;
1111+ // Container child vbox2.Gtk.Box+BoxChild
1112+ this.label5 = new Gtk.Label();
1113+ this.label5.Name = "label5";
1114+ this.label5.Xalign = 0F;
1115+ this.label5.LabelProp = Mono.Unix.Catalog.GetString("Configure Docklets:");
1116+ this.vbox2.Add(this.label5);
1117+ Gtk.Box.BoxChild w16 = ((Gtk.Box.BoxChild)(this.vbox2[this.label5]));
1118+ w16.Position = 5;
1119+ w16.Expand = false;
1120+ w16.Fill = false;
1121+ // Container child vbox2.Gtk.Box+BoxChild
1122+ this.scrolled_window = new Gtk.ScrolledWindow();
1123+ this.scrolled_window.CanFocus = true;
1124+ this.scrolled_window.Name = "scrolled_window";
1125+ this.scrolled_window.ShadowType = ((Gtk.ShadowType)(1));
1126+ this.vbox2.Add(this.scrolled_window);
1127+ Gtk.Box.BoxChild w17 = ((Gtk.Box.BoxChild)(this.vbox2[this.scrolled_window]));
1128+ w17.Position = 6;
1129+ this.Add(this.vbox2);
1130+ if ((this.Child != null)) {
1131+ this.Child.ShowAll();
1132+ }
1133+ this.Hide();
1134+ this.orientation_combobox.Changed += new System.EventHandler(this.OnOrientationComboboxChanged);
1135+ this.autohide_checkbutton.Toggled += new System.EventHandler(this.OnAutohideCheckbuttonToggled);
1136+ this.window_overlap_checkbutton.Toggled += new System.EventHandler(this.OnWindowOverlapCheckbuttonToggled);
1137+ this.zoom_checkbutton.Toggled += new System.EventHandler(this.OnZoomCheckbuttonToggled);
1138+ this.advanced_indicators_checkbutton.Toggled += new System.EventHandler(this.OnAdvancedIndicatorsCheckbuttonToggled);
1139+ this.zoom_scale.FormatValue += new Gtk.FormatValueHandler(this.OnZoomScaleFormatValue);
1140+ this.zoom_scale.ValueChanged += new System.EventHandler(this.OnZoomScaleValueChanged);
1141+ this.zoom_width_scale.ValueChanged += new System.EventHandler(this.OnZoomWidthScaleValueChanged);
1142+ }
1143+ }
1144+}
1145
1146=== added file 'Do.Interface.Linux.Docky/gtk-gui/generated.cs'
1147--- Do.Interface.Linux.Docky/gtk-gui/generated.cs 1970-01-01 00:00:00 +0000
1148+++ Do.Interface.Linux.Docky/gtk-gui/generated.cs 2009-04-19 22:16:43 +0000
1149@@ -0,0 +1,82 @@
1150+// ------------------------------------------------------------------------------
1151+// <autogenerated>
1152+// This code was generated by a tool.
1153+//
1154+//
1155+// Changes to this file may cause incorrect behavior and will be lost if
1156+// the code is regenerated.
1157+// </autogenerated>
1158+// ------------------------------------------------------------------------------
1159+
1160+namespace Stetic {
1161+
1162+
1163+ internal class Gui {
1164+
1165+ private static bool initialized;
1166+
1167+ internal static void Initialize(Gtk.Widget iconRenderer) {
1168+ if ((Stetic.Gui.initialized == false)) {
1169+ Stetic.Gui.initialized = true;
1170+ }
1171+ }
1172+ }
1173+
1174+ internal class BinContainer {
1175+
1176+ private Gtk.Widget child;
1177+
1178+ private Gtk.UIManager uimanager;
1179+
1180+ public static BinContainer Attach(Gtk.Bin bin) {
1181+ BinContainer bc = new BinContainer();
1182+ bin.SizeRequested += new Gtk.SizeRequestedHandler(bc.OnSizeRequested);
1183+ bin.SizeAllocated += new Gtk.SizeAllocatedHandler(bc.OnSizeAllocated);
1184+ bin.Added += new Gtk.AddedHandler(bc.OnAdded);
1185+ return bc;
1186+ }
1187+
1188+ private void OnSizeRequested(object sender, Gtk.SizeRequestedArgs args) {
1189+ if ((this.child != null)) {
1190+ args.Requisition = this.child.SizeRequest();
1191+ }
1192+ }
1193+
1194+ private void OnSizeAllocated(object sender, Gtk.SizeAllocatedArgs args) {
1195+ if ((this.child != null)) {
1196+ this.child.Allocation = args.Allocation;
1197+ }
1198+ }
1199+
1200+ private void OnAdded(object sender, Gtk.AddedArgs args) {
1201+ this.child = args.Widget;
1202+ }
1203+
1204+ public void SetUiManager(Gtk.UIManager uim) {
1205+ this.uimanager = uim;
1206+ this.child.Realized += new System.EventHandler(this.OnRealized);
1207+ }
1208+
1209+ private void OnRealized(object sender, System.EventArgs args) {
1210+ if ((this.uimanager != null)) {
1211+ Gtk.Widget w;
1212+ w = this.child.Toplevel;
1213+ if (((w != null) && typeof(Gtk.Window).IsInstanceOfType(w))) {
1214+ ((Gtk.Window)(w)).AddAccelGroup(this.uimanager.AccelGroup);
1215+ this.uimanager = null;
1216+ }
1217+ }
1218+ }
1219+ }
1220+
1221+ internal class ActionGroups {
1222+
1223+ public static Gtk.ActionGroup GetActionGroup(System.Type type) {
1224+ return Stetic.ActionGroups.GetActionGroup(type.FullName);
1225+ }
1226+
1227+ public static Gtk.ActionGroup GetActionGroup(string name) {
1228+ return null;
1229+ }
1230+ }
1231+}
1232
1233=== added file 'Do.Interface.Linux.Docky/gtk-gui/gui.stetic'
1234--- Do.Interface.Linux.Docky/gtk-gui/gui.stetic 1970-01-01 00:00:00 +0000
1235+++ Do.Interface.Linux.Docky/gtk-gui/gui.stetic 2009-04-21 02:15:39 +0000
1236@@ -0,0 +1,275 @@
1237+<?xml version="1.0" encoding="utf-8"?>
1238+<stetic-interface>
1239+ <configuration>
1240+ <images-root-path>..</images-root-path>
1241+ <target-gtk-version>2.12</target-gtk-version>
1242+ </configuration>
1243+ <import>
1244+ <widget-library name="wnck-sharp, Version=2.20.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f" />
1245+ <widget-library name="../../Do.Interface.Linux/bin/Debug/Do.Interface.Linux.dll" />
1246+ <widget-library name="gnomedesktop-sharp, Version=2.20.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f" />
1247+ <widget-library name="../../Do.Interface.Wink/bin/Debug/Do.Interface.Wnck.dll" />
1248+ <widget-library name="../bin/Debug/Do.Interface.Linux.Docky.dll" internal="true" />
1249+ <widget-library name="../../Do.Platform.Linux/bin/Debug/Do.Platform.Linux.dll" />
1250+ <widget-library name="../../Do.Interface.Linux.AnimationBase/bin/Debug/Do.Interface.Linux.AnimationBase.dll" />
1251+ </import>
1252+ <widget class="Gtk.Bin" id="Docky.Interface.DockyConfigurationWidget" design-size="376 347">
1253+ <property name="MemberName" />
1254+ <property name="Visible">False</property>
1255+ <child>
1256+ <widget class="Gtk.VBox" id="vbox2">
1257+ <property name="MemberName" />
1258+ <property name="Spacing">6</property>
1259+ <child>
1260+ <widget class="Gtk.HBox" id="hbox5">
1261+ <property name="MemberName" />
1262+ <property name="Spacing">6</property>
1263+ <child>
1264+ <widget class="Gtk.Label" id="orientation_label">
1265+ <property name="MemberName" />
1266+ <property name="LabelProp" translatable="yes">Orientation:</property>
1267+ </widget>
1268+ <packing>
1269+ <property name="Position">0</property>
1270+ <property name="AutoSize">True</property>
1271+ <property name="Expand">False</property>
1272+ <property name="Fill">False</property>
1273+ </packing>
1274+ </child>
1275+ <child>
1276+ <widget class="Gtk.ComboBox" id="orientation_combobox">
1277+ <property name="MemberName" />
1278+ <property name="IsTextCombo">True</property>
1279+ <property name="Items" translatable="yes" />
1280+ <signal name="Changed" handler="OnOrientationComboboxChanged" />
1281+ </widget>
1282+ <packing>
1283+ <property name="Position">1</property>
1284+ <property name="AutoSize">True</property>
1285+ <property name="Expand">False</property>
1286+ <property name="Fill">False</property>
1287+ </packing>
1288+ </child>
1289+ </widget>
1290+ <packing>
1291+ <property name="Position">0</property>
1292+ <property name="AutoSize">True</property>
1293+ <property name="Expand">False</property>
1294+ <property name="Fill">False</property>
1295+ </packing>
1296+ </child>
1297+ <child>
1298+ <widget class="Gtk.HBox" id="hbox8">
1299+ <property name="MemberName" />
1300+ <property name="Homogeneous">True</property>
1301+ <property name="Spacing">6</property>
1302+ <child>
1303+ <widget class="Gtk.CheckButton" id="autohide_checkbutton">
1304+ <property name="MemberName" />
1305+ <property name="CanFocus">True</property>
1306+ <property name="Label" translatable="yes">Automatically Hide</property>
1307+ <property name="DrawIndicator">True</property>
1308+ <property name="HasLabel">True</property>
1309+ <property name="UseUnderline">True</property>
1310+ <signal name="Toggled" handler="OnAutohideCheckbuttonToggled" />
1311+ </widget>
1312+ <packing>
1313+ <property name="Position">0</property>
1314+ <property name="AutoSize">True</property>
1315+ </packing>
1316+ </child>
1317+ <child>
1318+ <widget class="Gtk.CheckButton" id="window_overlap_checkbutton">
1319+ <property name="MemberName" />
1320+ <property name="CanFocus">True</property>
1321+ <property name="Label" translatable="yes">Allow Window Overlap</property>
1322+ <property name="DrawIndicator">True</property>
1323+ <property name="HasLabel">True</property>
1324+ <property name="UseUnderline">True</property>
1325+ <signal name="Toggled" handler="OnWindowOverlapCheckbuttonToggled" />
1326+ </widget>
1327+ <packing>
1328+ <property name="Position">1</property>
1329+ <property name="AutoSize">True</property>
1330+ </packing>
1331+ </child>
1332+ </widget>
1333+ <packing>
1334+ <property name="Position">1</property>
1335+ <property name="AutoSize">True</property>
1336+ <property name="Expand">False</property>
1337+ <property name="Fill">False</property>
1338+ </packing>
1339+ </child>
1340+ <child>
1341+ <widget class="Gtk.HBox" id="hbox9">
1342+ <property name="MemberName" />
1343+ <property name="Homogeneous">True</property>
1344+ <property name="Spacing">6</property>
1345+ <child>
1346+ <widget class="Gtk.CheckButton" id="zoom_checkbutton">
1347+ <property name="MemberName" />
1348+ <property name="CanFocus">True</property>
1349+ <property name="Label" translatable="yes">Enable Zoom</property>
1350+ <property name="DrawIndicator">True</property>
1351+ <property name="HasLabel">True</property>
1352+ <property name="UseUnderline">True</property>
1353+ <signal name="Toggled" handler="OnZoomCheckbuttonToggled" />
1354+ </widget>
1355+ <packing>
1356+ <property name="Position">0</property>
1357+ <property name="AutoSize">True</property>
1358+ </packing>
1359+ </child>
1360+ <child>
1361+ <widget class="Gtk.CheckButton" id="advanced_indicators_checkbutton">
1362+ <property name="MemberName" />
1363+ <property name="CanFocus">True</property>
1364+ <property name="Label" translatable="yes">Indicate Multiple Windows</property>
1365+ <property name="DrawIndicator">True</property>
1366+ <property name="HasLabel">True</property>
1367+ <property name="UseUnderline">True</property>
1368+ <signal name="Toggled" handler="OnAdvancedIndicatorsCheckbuttonToggled" />
1369+ </widget>
1370+ <packing>
1371+ <property name="Position">1</property>
1372+ <property name="AutoSize">True</property>
1373+ </packing>
1374+ </child>
1375+ </widget>
1376+ <packing>
1377+ <property name="Position">2</property>
1378+ <property name="AutoSize">True</property>
1379+ <property name="Expand">False</property>
1380+ <property name="Fill">False</property>
1381+ </packing>
1382+ </child>
1383+ <child>
1384+ <widget class="Gtk.HBox" id="hbox6">
1385+ <property name="MemberName" />
1386+ <property name="Spacing">6</property>
1387+ <child>
1388+ <widget class="Gtk.Label" id="zoom_size_label">
1389+ <property name="MemberName" />
1390+ <property name="Yalign">0.83</property>
1391+ <property name="LabelProp" translatable="yes">Zoom Size</property>
1392+ </widget>
1393+ <packing>
1394+ <property name="Position">0</property>
1395+ <property name="AutoSize">True</property>
1396+ <property name="Expand">False</property>
1397+ <property name="Fill">False</property>
1398+ </packing>
1399+ </child>
1400+ <child>
1401+ <widget class="Gtk.HScale" id="zoom_scale">
1402+ <property name="MemberName" />
1403+ <property name="CanFocus">True</property>
1404+ <property name="UpdatePolicy">Discontinuous</property>
1405+ <property name="Lower">0.1</property>
1406+ <property name="Upper">4</property>
1407+ <property name="PageIncrement">0.1</property>
1408+ <property name="PageSize">0.1</property>
1409+ <property name="StepIncrement">0.1</property>
1410+ <property name="Value">0.7</property>
1411+ <property name="DrawValue">True</property>
1412+ <property name="Digits">0</property>
1413+ <property name="ValuePos">Top</property>
1414+ <signal name="FormatValue" handler="OnZoomScaleFormatValue" />
1415+ <signal name="ValueChanged" handler="OnZoomScaleValueChanged" />
1416+ </widget>
1417+ <packing>
1418+ <property name="Position">1</property>
1419+ <property name="AutoSize">True</property>
1420+ </packing>
1421+ </child>
1422+ </widget>
1423+ <packing>
1424+ <property name="Position">3</property>
1425+ <property name="AutoSize">True</property>
1426+ <property name="Expand">False</property>
1427+ <property name="Fill">False</property>
1428+ </packing>
1429+ </child>
1430+ <child>
1431+ <widget class="Gtk.HBox" id="hbox7">
1432+ <property name="MemberName" />
1433+ <property name="Spacing">6</property>
1434+ <child>
1435+ <widget class="Gtk.Label" id="zoom_width_label">
1436+ <property name="MemberName" />
1437+ <property name="Yalign">0.83</property>
1438+ <property name="LabelProp" translatable="yes">Zoom Width</property>
1439+ </widget>
1440+ <packing>
1441+ <property name="Position">0</property>
1442+ <property name="AutoSize">True</property>
1443+ <property name="Expand">False</property>
1444+ <property name="Fill">False</property>
1445+ </packing>
1446+ </child>
1447+ <child>
1448+ <widget class="Gtk.HScale" id="zoom_width_scale">
1449+ <property name="MemberName" />
1450+ <property name="CanFocus">True</property>
1451+ <property name="UpdatePolicy">Discontinuous</property>
1452+ <property name="Upper">100</property>
1453+ <property name="PageIncrement">10</property>
1454+ <property name="PageSize">10</property>
1455+ <property name="StepIncrement">10</property>
1456+ <property name="Value">81</property>
1457+ <property name="DrawValue">True</property>
1458+ <property name="Digits">0</property>
1459+ <property name="ValuePos">Top</property>
1460+ <signal name="ValueChanged" handler="OnZoomWidthScaleValueChanged" />
1461+ </widget>
1462+ <packing>
1463+ <property name="Position">1</property>
1464+ <property name="AutoSize">True</property>
1465+ </packing>
1466+ </child>
1467+ </widget>
1468+ <packing>
1469+ <property name="Position">4</property>
1470+ <property name="AutoSize">True</property>
1471+ <property name="Expand">False</property>
1472+ <property name="Fill">False</property>
1473+ </packing>
1474+ </child>
1475+ <child>
1476+ <widget class="Gtk.Label" id="label5">
1477+ <property name="MemberName" />
1478+ <property name="Xalign">0</property>
1479+ <property name="LabelProp" translatable="yes">Configure Docklets:</property>
1480+ </widget>
1481+ <packing>
1482+ <property name="Position">5</property>
1483+ <property name="AutoSize">True</property>
1484+ <property name="Expand">False</property>
1485+ <property name="Fill">False</property>
1486+ </packing>
1487+ </child>
1488+ <child>
1489+ <widget class="Gtk.ScrolledWindow" id="scrolled_window">
1490+ <property name="MemberName" />
1491+ <property name="CanFocus">True</property>
1492+ <property name="ShadowType">In</property>
1493+ <child>
1494+ <widget class="Gtk.Viewport" id="GtkViewport">
1495+ <property name="MemberName" />
1496+ <property name="ShadowType">None</property>
1497+ <child>
1498+ <placeholder />
1499+ </child>
1500+ </widget>
1501+ </child>
1502+ </widget>
1503+ <packing>
1504+ <property name="Position">6</property>
1505+ <property name="AutoSize">True</property>
1506+ </packing>
1507+ </child>
1508+ </widget>
1509+ </child>
1510+ </widget>
1511+</stetic-interface>
1512\ No newline at end of file
1513
1514=== modified file 'Do.Interface.Linux.Docky/src/Docky.Interface/DockArea.cs'
1515--- Do.Interface.Linux.Docky/src/Docky.Interface/DockArea.cs 2009-04-18 03:12:46 +0000
1516+++ Do.Interface.Linux.Docky/src/Docky.Interface/DockArea.cs 2009-04-21 04:12:30 +0000
1517@@ -257,6 +257,7 @@
1518
1519 DockPreferences.MonitorChanged += HandleMonitorChanged;
1520 DockPreferences.IconSizeChanged += HandleIconSizeChanged;
1521+ DockPreferences.OrientationChanged += HandleOrientationChanged;
1522
1523 DockServices.PainterService.PainterShowRequest += HandlePainterShowRequest;
1524 DockServices.PainterService.PainterHideRequest += HandlePainterHideRequest;
1525@@ -284,6 +285,7 @@
1526
1527 DockPreferences.MonitorChanged -= HandleMonitorChanged;
1528 DockPreferences.IconSizeChanged -= HandleIconSizeChanged;
1529+ DockPreferences.OrientationChanged -= HandleOrientationChanged;
1530
1531 DockServices.PainterService.PainterShowRequest -= HandlePainterShowRequest;
1532 DockServices.PainterService.PainterHideRequest -= HandlePainterHideRequest;
1533@@ -336,6 +338,12 @@
1534 {
1535 Reconfigure ();
1536 }
1537+
1538+ void HandleOrientationChanged()
1539+ {
1540+ Reconfigure ();
1541+ window.Reposition ();
1542+ }
1543
1544 void HandleSizeChanged(object sender, EventArgs e)
1545 {
1546@@ -366,6 +374,7 @@
1547
1548 void HandleIconSizeChanged()
1549 {
1550+ Reconfigure ();
1551 AnimatedDraw ();
1552 }
1553
1554@@ -647,6 +656,16 @@
1555
1556 //send off the clicks
1557 Gdk.Point relative_point = Gdk.Point.Zero;
1558+ double zoom;
1559+ PointD center;
1560+ IconZoomedPosition (item, out center, out zoom);
1561+
1562+ int xOffset = (int) (Cursor.X - center.X);
1563+ int yOffset = (int) (Cursor.Y - center.Y);
1564+
1565+ relative_point.X = (int) (xOffset / zoom);
1566+ relative_point.Y = (int) (yOffset / zoom);
1567+
1568 DockItems [item].Clicked (evnt.Button, evnt.State, relative_point);
1569
1570 AnimatedDraw ();
1571
1572=== modified file 'Do.Interface.Linux.Docky/src/Docky.Interface/DockWindow.cs'
1573--- Do.Interface.Linux.Docky/src/Docky.Interface/DockWindow.cs 2009-04-18 03:12:46 +0000
1574+++ Do.Interface.Linux.Docky/src/Docky.Interface/DockWindow.cs 2009-04-20 13:24:35 +0000
1575@@ -28,6 +28,7 @@
1576
1577 using Do.Universe;
1578 using Do.Platform;
1579+using Do.Platform.Linux;
1580 using Do.Interface;
1581 using Do.Interface.Xlib;
1582 using Do.Interface.CairoUtils;
1583@@ -37,7 +38,7 @@
1584 {
1585
1586
1587- public class DockWindow : Gtk.Window, IDoWindow
1588+ public class DockWindow : Gtk.Window, IDoWindow, IConfigurable
1589 {
1590 public static Gtk.Window Window { get; private set; }
1591
1592@@ -229,7 +230,7 @@
1593 Reposition ();
1594 }
1595
1596- void Reposition ()
1597+ public void Reposition ()
1598 {
1599 Gdk.Rectangle geo, main, res;
1600
1601@@ -449,6 +450,26 @@
1602 base.Dispose ();
1603 }
1604
1605+
1606 #endregion
1607+
1608+ #region IConfigurable implementation
1609+ public Bin GetConfiguration ()
1610+ {
1611+ return new DockyConfigurationWidget ();
1612+ }
1613+
1614+ public string Description {
1615+ get {
1616+ return "Docky configuration";
1617+ }
1618+ }
1619+
1620+ public new string Icon {
1621+ get {
1622+ return "panel";
1623+ }
1624+ }
1625+ #endregion
1626 }
1627 }
1628
1629=== modified file 'Do.Interface.Linux.Docky/src/Docky.Interface/Docky.Interface.Items/AbstractDockItem.cs'
1630--- Do.Interface.Linux.Docky/src/Docky.Interface/Docky.Interface.Items/AbstractDockItem.cs 2009-03-20 20:43:06 +0000
1631+++ Do.Interface.Linux.Docky/src/Docky.Interface/Docky.Interface.Items/AbstractDockItem.cs 2009-04-21 16:10:39 +0000
1632@@ -115,6 +115,10 @@
1633 get { return ScalingType.Downscaled; }
1634 }
1635
1636+ protected virtual string Icon {
1637+ get { return "default"; }
1638+ }
1639+
1640 /// <value>
1641 /// Whether or not to draw an application present indicator
1642 /// </value>
1643@@ -145,7 +149,21 @@
1644 ResetSurfaces ();
1645 }
1646
1647- protected abstract Pixbuf GetSurfacePixbuf (int size);
1648+ protected virtual Pixbuf GetSurfacePixbuf (int size)
1649+ {
1650+ if (Icon == null)
1651+ return null;
1652+
1653+ Gdk.Pixbuf pbuf = IconProvider.PixbufFromIconName (Icon, size);
1654+ if (pbuf.Height != size && pbuf.Width != size) {
1655+ double scale = (double)DockPreferences.FullIconSize / Math.Max (pbuf.Width, pbuf.Height);
1656+ Gdk.Pixbuf temp = pbuf.ScaleSimple ((int) (pbuf.Width * scale), (int) (pbuf.Height * scale), InterpType.Bilinear);
1657+ pbuf.Dispose ();
1658+ pbuf = temp;
1659+ }
1660+
1661+ return pbuf;
1662+ }
1663
1664 /// <summary>
1665 /// Called whenever the icon receives a click event
1666
1667=== modified file 'Do.Interface.Linux.Docky/src/Docky.Interface/Docky.Interface.Items/ActionDockItem.cs'
1668--- Do.Interface.Linux.Docky/src/Docky.Interface/Docky.Interface.Items/ActionDockItem.cs 2009-02-06 23:29:30 +0000
1669+++ Do.Interface.Linux.Docky/src/Docky.Interface/Docky.Interface.Items/ActionDockItem.cs 2009-04-21 16:10:39 +0000
1670@@ -37,8 +37,8 @@
1671 Act action;
1672 Do.Universe.Item target_item;
1673
1674- string Icon {
1675- get { return action.Icon; }
1676+ protected override string Icon {
1677+ get { return action.Icon; }
1678 }
1679
1680 public ActionDockItem(Act action, Do.Universe.Item targetItem)
1681@@ -48,19 +48,6 @@
1682 SetText (action.Name);
1683 }
1684
1685- protected override Pixbuf GetSurfacePixbuf (int size)
1686- {
1687- Gdk.Pixbuf pbuf = IconProvider.PixbufFromIconName (Icon, size);
1688- if (pbuf.Height != size && pbuf.Width != size) {
1689- double scale = (double)DockPreferences.FullIconSize / Math.Max (pbuf.Width, pbuf.Height);
1690- Gdk.Pixbuf temp = pbuf.ScaleSimple ((int) (pbuf.Width * scale), (int) (pbuf.Height * scale), InterpType.Bilinear);
1691- pbuf.Dispose ();
1692- pbuf = temp;
1693- }
1694-
1695- return pbuf;
1696- }
1697-
1698 public override void Clicked (uint button, ModifierType state, Gdk.Point position)
1699 {
1700 if (button == 1) {
1701
1702=== modified file 'Do.Interface.Linux.Docky/src/Docky.Interface/Docky.Interface.Items/ClockDockItem.cs'
1703--- Do.Interface.Linux.Docky/src/Docky.Interface/Docky.Interface.Items/ClockDockItem.cs 2009-02-22 05:18:44 +0000
1704+++ Do.Interface.Linux.Docky/src/Docky.Interface/Docky.Interface.Items/ClockDockItem.cs 2009-04-21 16:10:39 +0000
1705@@ -80,11 +80,6 @@
1706 return true;
1707 }
1708
1709- protected override Pixbuf GetSurfacePixbuf (int size)
1710- {
1711- return null;
1712- }
1713-
1714 void RenderFileOntoContext (Context cr, string file, int size)
1715 {
1716 if (!File.Exists (file))
1717
1718=== modified file 'Do.Interface.Linux.Docky/src/Docky.Interface/Docky.Interface.Items/DoDockItem.cs'
1719--- Do.Interface.Linux.Docky/src/Docky.Interface/Docky.Interface.Items/DoDockItem.cs 2009-03-08 01:18:43 +0000
1720+++ Do.Interface.Linux.Docky/src/Docky.Interface/Docky.Interface.Items/DoDockItem.cs 2009-04-21 16:10:39 +0000
1721@@ -40,10 +40,13 @@
1722
1723 public class DoDockItem : AbstractDockItem, IRightClickable
1724 {
1725- const string DoIcon = "gnome-do";
1726 public const string EnableIcon = "gtk-apply";
1727 public const string DisableIcon = "gtk-remove";
1728 const string Text = "GNOME Do";
1729+
1730+ protected override string Icon {
1731+ get { return "gnome-do"; }
1732+ }
1733
1734 HotSeatPainter hot_seat_painter;
1735
1736@@ -54,13 +57,6 @@
1737 return ScalingType.HighLow;
1738 }
1739 }
1740-
1741-
1742- protected override Pixbuf GetSurfacePixbuf (int size)
1743- {
1744- return IconProvider.PixbufFromIconName (DoIcon, size);
1745- }
1746-
1747
1748 public override void Clicked (uint button, ModifierType state, Gdk.Point position)
1749 {
1750@@ -79,10 +75,6 @@
1751
1752 SetText (Catalog.GetString (Text));
1753 }
1754-
1755- #region IDisposable implementation
1756-
1757- #endregion
1758
1759 public override bool Equals (AbstractDockItem other)
1760 {
1761@@ -100,62 +92,19 @@
1762 yield return new SimpleMenuButtonArgs (() => DockPreferences.AutoHide = !DockPreferences.AutoHide,
1763 Catalog.GetString ("Automatically Hide"), DockPreferences.AutoHide ? EnableIcon : DisableIcon).AsDark ();
1764
1765- if (!DockPreferences.AutoHide)
1766- yield return new SimpleMenuButtonArgs (() => DockPreferences.AllowOverlap = !DockPreferences.AllowOverlap,
1767- Catalog.GetString ("Allow Window Overlap"), DockPreferences.AllowOverlap ? EnableIcon : DisableIcon).AsDark ();
1768-
1769- yield return new SimpleMenuButtonArgs (() => DockPreferences.IndicateMultipleWindows = !DockPreferences.IndicateMultipleWindows,
1770- Catalog.GetString ("Advanced Indicators"), DockPreferences.IndicateMultipleWindows ? EnableIcon : DisableIcon).AsDark ();
1771-
1772 yield return new SimpleMenuButtonArgs (() => DockPreferences.ZoomEnabled = !DockPreferences.ZoomEnabled,
1773 Catalog.GetString ("Zoom Icons"), DockPreferences.ZoomEnabled ? EnableIcon : DisableIcon).AsDark ();
1774
1775-// if (DockPreferences.ZoomEnabled) {
1776-// yield return new SeparatorMenuButtonArgs ();
1777-// yield return new WidgetMenuArgs (BuildScaleWidget ());
1778-// }
1779-
1780 if (Gdk.Screen.Default.NMonitors > 1)
1781 yield return new SimpleMenuButtonArgs (() => DockPreferences.Monitor++,
1782 Catalog.GetString ("Switch Monitors"), "display").AsDark ();
1783
1784- yield return new SeparatorMenuButtonArgs ();
1785-
1786- foreach (AbstractDockletItem dockitem in DockServices.DockletService.Docklets) {
1787- yield return new ToggleDockletMenuButtonArgs (dockitem).AsDark ();
1788- }
1789-
1790 foreach (IRunnableItem item in Services.Application.MainMenuItems) {
1791 yield return new SeparatorMenuButtonArgs ();
1792 yield return new RunnableMenuButtonArgs (item);
1793 }
1794 }
1795-
1796- void HandleValueChanged(object sender, EventArgs e)
1797- {
1798- if (!(sender is HScale)) return;
1799-
1800- HScale scale = sender as HScale;
1801- DockPreferences.ZoomPercent = scale.Value;
1802- }
1803
1804 #endregion
1805-
1806- Gtk.HScale BuildScaleWidget ()
1807- {
1808- Gtk.HScale hscale = new Gtk.HScale (1.1, 4, .1);
1809- hscale.Value = DockPreferences.ZoomPercent;
1810- hscale.Name = "Zoom";
1811- hscale.CanFocus = false;
1812- hscale.FormatValue +=HandleFormatValue;
1813- hscale.ModifyFg (StateType.Normal, new Gdk.Color (byte.MaxValue, byte.MaxValue, byte.MaxValue));
1814- hscale.ValueChanged +=HandleValueChanged;
1815- return hscale;
1816- }
1817-
1818- void HandleFormatValue(object o, FormatValueArgs args)
1819- {
1820- args.RetVal = string.Format ("{0}%", Math.Round (args.Value * 100));
1821- }
1822 }
1823 }
1824
1825=== modified file 'Do.Interface.Linux.Docky/src/Docky.Interface/Docky.Interface.Items/HotSeatProxyItem.cs'
1826--- Do.Interface.Linux.Docky/src/Docky.Interface/Docky.Interface.Items/HotSeatProxyItem.cs 2009-02-06 23:29:30 +0000
1827+++ Do.Interface.Linux.Docky/src/Docky.Interface/Docky.Interface.Items/HotSeatProxyItem.cs 2009-04-21 16:10:39 +0000
1828@@ -113,11 +113,6 @@
1829 this.inner = inner;
1830 }
1831
1832- protected override Pixbuf GetSurfacePixbuf (int size)
1833- {
1834- return null;
1835- }
1836-
1837 public override Surface GetIconSurface (Cairo.Surface similar, int targetSize, out int actualSize)
1838 {
1839 return inner.GetIconSurface (similar, targetSize, out actualSize);
1840
1841=== modified file 'Do.Interface.Linux.Docky/src/Docky.Interface/Docky.Interface.Items/ItemDockItem.cs'
1842--- Do.Interface.Linux.Docky/src/Docky.Interface/Docky.Interface.Items/ItemDockItem.cs 2009-04-07 06:35:47 +0000
1843+++ Do.Interface.Linux.Docky/src/Docky.Interface/Docky.Interface.Items/ItemDockItem.cs 2009-04-21 16:10:39 +0000
1844@@ -60,7 +60,7 @@
1845 get { return accepting_drops; }
1846 }
1847
1848- string Icon {
1849+ protected override string Icon {
1850 get { return element.Icon; }
1851 }
1852
1853@@ -205,19 +205,6 @@
1854 return false;
1855 }
1856
1857- protected override Gdk.Pixbuf GetSurfacePixbuf (int size)
1858- {
1859- Gdk.Pixbuf pbuf = IconProvider.PixbufFromIconName (Icon, size);
1860- if (pbuf.Height != size && pbuf.Width != size) {
1861- double scale = (double)DockPreferences.FullIconSize / Math.Max (pbuf.Width, pbuf.Height);
1862- Gdk.Pixbuf temp = pbuf.ScaleSimple ((int) (pbuf.Width * scale), (int) (pbuf.Height * scale), InterpType.Bilinear);
1863- pbuf.Dispose ();
1864- pbuf = temp;
1865- }
1866-
1867- return pbuf;
1868- }
1869-
1870 public override Pixbuf GetDragPixbuf ()
1871 {
1872 if (drag_pixbuf == null)
1873
1874=== modified file 'Do.Interface.Linux.Docky/src/Docky.Interface/Docky.Interface.Items/SeparatorItem.cs'
1875--- Do.Interface.Linux.Docky/src/Docky.Interface/Docky.Interface.Items/SeparatorItem.cs 2009-02-23 18:11:06 +0000
1876+++ Do.Interface.Linux.Docky/src/Docky.Interface/Docky.Interface.Items/SeparatorItem.cs 2009-04-21 16:10:39 +0000
1877@@ -59,12 +59,6 @@
1878 sr = null;
1879 }
1880
1881- protected override Pixbuf GetSurfacePixbuf (int size)
1882- {
1883- return null;
1884- }
1885-
1886-
1887 public override Surface GetIconSurface (Surface buffer, int targetSize, out int actualSize)
1888 {
1889 actualSize = DockPreferences.IconSize;
1890
1891=== modified file 'Do.Interface.Linux.Docky/src/Docky.Interface/Docky.Interface.Items/TrashDockItem.cs'
1892--- Do.Interface.Linux.Docky/src/Docky.Interface/Docky.Interface.Items/TrashDockItem.cs 2009-04-07 06:26:08 +0000
1893+++ Do.Interface.Linux.Docky/src/Docky.Interface/Docky.Interface.Items/TrashDockItem.cs 2009-04-21 16:10:39 +0000
1894@@ -53,11 +53,16 @@
1895 }
1896
1897 public override string Name {
1898+ get { return "Trash"; }
1899+ }
1900+
1901+ protected override string Icon {
1902 get {
1903- return "Trash";
1904+ if (Directory.Exists (Trash) && (Directory.GetFiles (Trash).Any () || Directory.GetDirectories (Trash).Any ()))
1905+ return TrashFullIcon;
1906+ return TrashEmptyIcon;
1907 }
1908 }
1909-
1910
1911 public TrashDockItem()
1912 {
1913@@ -82,13 +87,6 @@
1914 RedrawIcon ();
1915 });
1916 }
1917-
1918- protected override Pixbuf GetSurfacePixbuf (int size)
1919- {
1920- if (Directory.Exists (Trash) && (Directory.GetFiles (Trash).Any () || Directory.GetDirectories (Trash).Any ()))
1921- return IconProvider.PixbufFromIconName (TrashFullIcon, size);
1922- return IconProvider.PixbufFromIconName (TrashEmptyIcon, size);
1923- }
1924
1925 public override bool ReceiveItem (string item)
1926 {
1927
1928=== added file 'Do.Interface.Linux.Docky/src/Docky.Interface/DockyConfigurationWidget.cs'
1929--- Do.Interface.Linux.Docky/src/Docky.Interface/DockyConfigurationWidget.cs 1970-01-01 00:00:00 +0000
1930+++ Do.Interface.Linux.Docky/src/Docky.Interface/DockyConfigurationWidget.cs 2009-04-21 02:15:39 +0000
1931@@ -0,0 +1,206 @@
1932+//
1933+// Copyright (C) 2009 GNOME Do
1934+//
1935+// This program is free software: you can redistribute it and/or modify
1936+// it under the terms of the GNU General Public License as published by
1937+// the Free Software Foundation, either version 3 of the License, or
1938+// (at your option) any later version.
1939+//
1940+// This program is distributed in the hope that it will be useful,
1941+// but WITHOUT ANY WARRANTY; without even the implied warranty of
1942+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
1943+// GNU General Public License for more details.
1944+//
1945+// You should have received a copy of the GNU General Public License
1946+// along with this program. If not, see <http://www.gnu.org/licenses/>.
1947+//
1948+
1949+using System;
1950+using System.Collections.Generic;
1951+using System.Linq;
1952+
1953+using Cairo;
1954+using Gdk;
1955+using Gtk;
1956+
1957+using Docky.Utilities;
1958+using Docky.Core;
1959+
1960+namespace Docky.Interface
1961+{
1962+
1963+
1964+ [System.ComponentModel.ToolboxItem(true)]
1965+ public partial class DockyConfigurationWidget : Gtk.Bin
1966+ {
1967+ NodeView docklets_nodeview;
1968+
1969+ [TreeNode (ListOnly=true)]
1970+ class DockletTreeNode : TreeNode {
1971+ AbstractDockletItem docklet;
1972+
1973+ public DockletTreeNode (AbstractDockletItem docklet)
1974+ {
1975+ this.docklet = docklet;
1976+ }
1977+
1978+ [TreeNodeValue (Column=0)]
1979+ public bool Enabled {
1980+ get { return DockServices.DockletService.ActiveDocklets.Contains (docklet); }
1981+ }
1982+
1983+ [TreeNodeValue (Column=1)]
1984+ public string Name {
1985+ get { return docklet.Name; }
1986+ }
1987+
1988+ public void Toggle ()
1989+ {
1990+ DockServices.DockletService.ToggleDocklet (docklet);
1991+ }
1992+ }
1993+
1994+ bool setup = false;
1995+
1996+ NodeStore store;
1997+ NodeStore Store {
1998+ get {
1999+ if (store == null) {
2000+ store = new NodeStore (typeof (DockletTreeNode));
2001+
2002+ }
2003+ return store;
2004+ }
2005+ }
2006+
2007+ public DockyConfigurationWidget()
2008+ {
2009+ setup = true;
2010+ this.Build();
2011+
2012+ zoom_scale.Digits = 1;
2013+ zoom_scale.SetRange (1.1, 4);
2014+ zoom_scale.SetIncrements (.1, .1);
2015+ zoom_scale.Value = DockPreferences.ZoomPercent;
2016+
2017+ zoom_width_scale.Digits = 0;
2018+ zoom_width_scale.SetRange (200, 500);
2019+ zoom_width_scale.SetIncrements (10, 10);
2020+ zoom_width_scale.Value = DockPreferences.ZoomSize;
2021+
2022+ advanced_indicators_checkbutton.Active = DockPreferences.IndicateMultipleWindows;
2023+ autohide_checkbutton.Active = DockPreferences.AutoHide;
2024+ window_overlap_checkbutton.Active = DockPreferences.AllowOverlap;
2025+ zoom_checkbutton.Active = DockPreferences.ZoomEnabled;
2026+
2027+ orientation_combobox.AppendText (DockOrientation.Bottom.ToString ());
2028+ orientation_combobox.AppendText (DockOrientation.Top.ToString ());
2029+ orientation_combobox.Active = DockPreferences.Orientation == DockOrientation.Bottom ? 0 : 1;
2030+
2031+ BuildDocklets ();
2032+
2033+ SetSensativity ();
2034+
2035+ DockPreferences.IconSizeChanged += HandleIconSizeChanged;
2036+
2037+ Gtk.Application.Invoke (delegate { setup = false; });
2038+ }
2039+
2040+ void HandleIconSizeChanged()
2041+ {
2042+ SetSensativity ();
2043+ }
2044+
2045+ void BuildDocklets ()
2046+ {
2047+ docklets_nodeview = new NodeView (Store);
2048+ docklets_nodeview.RulesHint = true;
2049+ scrolled_window.Add (docklets_nodeview);
2050+
2051+ Gtk.CellRendererToggle toggle = new Gtk.CellRendererToggle ();
2052+ toggle.Toggled += HandleToggled;
2053+ docklets_nodeview.AppendColumn ("Enabled", toggle, "active", 0);
2054+ docklets_nodeview.AppendColumn ("Name", new Gtk.CellRendererText (), "text", 1);
2055+
2056+ docklets_nodeview.HeadersVisible = false;
2057+
2058+ foreach (AbstractDockletItem adi in DockServices.DockletService.Docklets) {
2059+ Store.AddNode (new DockletTreeNode (adi));
2060+ }
2061+
2062+ scrolled_window.ShowAll ();
2063+ }
2064+
2065+ void SetSensativity ()
2066+ {
2067+ zoom_scale.Sensitive =
2068+ zoom_width_scale.Sensitive =
2069+ zoom_size_label.Sensitive =
2070+ zoom_width_label.Sensitive =
2071+ DockPreferences.ZoomEnabled;
2072+ }
2073+
2074+ void HandleToggled (object o, ToggledArgs args)
2075+ {
2076+ DockletTreeNode node = Store.GetNode (new Gtk.TreePath (args.Path)) as DockletTreeNode;
2077+ node.Toggle ();
2078+ }
2079+
2080+ protected virtual void OnZoomScaleFormatValue (object o, Gtk.FormatValueArgs args)
2081+ {
2082+ args.RetVal = string.Format ("{0}%", Math.Round (args.Value * 100));
2083+ }
2084+
2085+ protected virtual void OnZoomScaleValueChanged (object sender, System.EventArgs e)
2086+ {
2087+ if (setup) return;
2088+ if (!(sender is HScale)) return;
2089+
2090+ HScale scale = sender as HScale;
2091+ DockPreferences.ZoomPercent = scale.Value;
2092+ }
2093+
2094+ protected virtual void OnAdvancedIndicatorsCheckbuttonToggled (object sender, System.EventArgs e)
2095+ {
2096+ if (setup) return;
2097+ DockPreferences.IndicateMultipleWindows = advanced_indicators_checkbutton.Active;
2098+ }
2099+
2100+ protected virtual void OnZoomCheckbuttonToggled (object sender, System.EventArgs e)
2101+ {
2102+ if (setup) return;
2103+ DockPreferences.ZoomEnabled = zoom_checkbutton.Active;
2104+ }
2105+
2106+ protected virtual void OnWindowOverlapCheckbuttonToggled (object sender, System.EventArgs e)
2107+ {
2108+ if (setup) return;
2109+ DockPreferences.AllowOverlap = window_overlap_checkbutton.Active;
2110+ }
2111+
2112+ protected virtual void OnAutohideCheckbuttonToggled (object sender, System.EventArgs e)
2113+ {
2114+ if (setup) return;
2115+ DockPreferences.AutoHide = autohide_checkbutton.Active;
2116+ }
2117+
2118+ protected virtual void OnOrientationComboboxChanged (object sender, System.EventArgs e)
2119+ {
2120+ if (setup) return;
2121+ DockPreferences.Orientation = (DockOrientation) orientation_combobox.Active;
2122+ }
2123+
2124+ protected virtual void OnZoomWidthScaleValueChanged (object sender, System.EventArgs e)
2125+ {
2126+ if (setup) return;
2127+ DockPreferences.ZoomSize = (int) zoom_width_scale.Value;
2128+ }
2129+
2130+ public override void Dispose ()
2131+ {
2132+ DockPreferences.IconSizeChanged -= HandleIconSizeChanged;
2133+ base.Dispose ();
2134+ }
2135+
2136+ }
2137+}
2138
2139=== modified file 'Do.Interface.Linux.Docky/src/Docky.Utilities/DockPreferences.cs'
2140--- Do.Interface.Linux.Docky/src/Docky.Utilities/DockPreferences.cs 2009-03-04 19:07:54 +0000
2141+++ Do.Interface.Linux.Docky/src/Docky.Utilities/DockPreferences.cs 2009-04-20 13:24:35 +0000
2142@@ -37,6 +37,7 @@
2143 public static event Action AutomaticIconsChanged;
2144 public static event Action MonitorChanged;
2145 public static event Action AllowOverlapChanged;
2146+ public static event Action OrientationChanged;
2147
2148 public const int IconBorderWidth = 2;
2149 public const string HighlightFormat = "<span foreground=\"#5599ff\">{0}</span>";
2150@@ -221,8 +222,12 @@
2151 return orientation;
2152 }
2153 set {
2154+ if (orientation == value)
2155+ return;
2156 orientation = value;
2157 prefs.Set ("Orientation", value.ToString ());
2158+ if (OrientationChanged != null)
2159+ OrientationChanged ();
2160 }
2161 }
2162
2163
2164=== modified file 'Do.Interface.Linux.GlassFrame/Do.Interface.Linux.GlassFrame.mdp'
2165--- Do.Interface.Linux.GlassFrame/Do.Interface.Linux.GlassFrame.mdp 2009-01-27 03:23:24 +0000
2166+++ Do.Interface.Linux.GlassFrame/Do.Interface.Linux.GlassFrame.mdp 2009-04-20 00:12:53 +0000
2167@@ -1,10 +1,10 @@
2168-<Project name="Do.Interface.Linux.GlassFrame" fileversion="2.0" language="C#" clr-version="Net_2_0" targetFramework="2.0" ctype="DotNetProject">
2169+<Project name="Do.Interface.Linux.GlassFrame" fileversion="2.0" language="C#" clr-version="Net_2_0" targetFramework="3.5" ctype="DotNetProject">
2170 <Configurations active="Debug">
2171 <Configuration name="Debug" ctype="DotNetProjectConfiguration">
2172 <Output directory="bin/Debug" assembly="Do.Interface.Linux.GlassFrame" />
2173 <Build debugmode="True" target="Library" />
2174 <Execution runwithwarnings="True" consolepause="False" runtime="MsNet" clr-version="Net_2_0" />
2175- <CodeGeneration compiler="Mcs" warninglevel="4" optimize="False" unsafecodeallowed="False" generateoverflowchecks="False" definesymbols="DEBUG" generatexmldocumentation="False" ctype="CSharpCompilerParameters" />
2176+ <CodeGeneration compiler="Mcs" warninglevel="4" optimize="True" unsafecodeallowed="False" generateoverflowchecks="True" definesymbols="DEBUG" generatexmldocumentation="False" ctype="CSharpCompilerParameters" />
2177 </Configuration>
2178 <Configuration name="Release" ctype="DotNetProjectConfiguration">
2179 <Output directory="bin/Release" assembly="Do.Interface.Linux.GlassFrame" />
2180@@ -30,5 +30,6 @@
2181 <ProjectReference type="Gac" localcopy="True" refto="System.Core, Version=3.5.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
2182 <ProjectReference type="Project" localcopy="True" refto="Do.Interface.Linux" />
2183 <ProjectReference type="Project" localcopy="True" refto="Do.Platform" />
2184+ <ProjectReference type="Project" localcopy="True" refto="Do.Interface.Linux.AnimationBase" />
2185 </References>
2186 </Project>
2187\ No newline at end of file
2188
2189=== modified file 'Do.Interface.Linux.GlassFrame/Makefile.am'
2190--- Do.Interface.Linux.GlassFrame/Makefile.am 2008-12-15 22:25:09 +0000
2191+++ Do.Interface.Linux.GlassFrame/Makefile.am 2009-04-20 00:15:20 +0000
2192@@ -20,4 +20,5 @@
2193
2194 PROJECT_REFERENCES = \
2195 Do.Interface.Linux \
2196+ Do.Interface.Linux.AnimationBase \
2197 Do.Platform
2198
2199=== modified file 'Do.Interface.Linux.HUD/Do.Interface.Linux.HUD.mdp'
2200--- Do.Interface.Linux.HUD/Do.Interface.Linux.HUD.mdp 2009-01-27 03:23:24 +0000
2201+++ Do.Interface.Linux.HUD/Do.Interface.Linux.HUD.mdp 2009-04-20 00:12:53 +0000
2202@@ -1,10 +1,10 @@
2203-<Project name="Do.Interface.Linux.HUD" fileversion="2.0" language="C#" clr-version="Net_2_0" targetFramework="2.0" ctype="DotNetProject">
2204+<Project name="Do.Interface.Linux.HUD" fileversion="2.0" language="C#" clr-version="Net_2_0" targetFramework="3.5" ctype="DotNetProject">
2205 <Configurations active="Debug">
2206 <Configuration name="Debug" ctype="DotNetProjectConfiguration">
2207 <Output directory="bin/Debug" assembly="Do.Interface.Linux.HUD" />
2208 <Build debugmode="True" target="Library" />
2209 <Execution runwithwarnings="True" consolepause="False" runtime="MsNet" clr-version="Net_2_0" />
2210- <CodeGeneration compiler="Mcs" warninglevel="4" optimize="False" unsafecodeallowed="False" generateoverflowchecks="False" definesymbols="DEBUG" generatexmldocumentation="False" ctype="CSharpCompilerParameters" />
2211+ <CodeGeneration compiler="Mcs" warninglevel="4" optimize="True" unsafecodeallowed="False" generateoverflowchecks="True" definesymbols="DEBUG" generatexmldocumentation="False" ctype="CSharpCompilerParameters" />
2212 </Configuration>
2213 <Configuration name="Release" ctype="DotNetProjectConfiguration">
2214 <Output directory="bin/Release" assembly="Do.Interface.Linux.HUD" />
2215@@ -29,5 +29,6 @@
2216 <ProjectReference type="Gac" localcopy="True" refto="gtk-sharp, Version=2.12.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f" />
2217 <ProjectReference type="Gac" localcopy="True" refto="Mono.Cairo, Version=2.0.0.0, Culture=neutral, PublicKeyToken=0738eb9f132ed756" />
2218 <ProjectReference type="Gac" localcopy="True" refto="System.Core, Version=3.5.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
2219+ <ProjectReference type="Project" localcopy="True" refto="Do.Interface.Linux.AnimationBase" />
2220 </References>
2221 </Project>
2222\ No newline at end of file
2223
2224=== modified file 'Do.Interface.Linux.HUD/Makefile.am'
2225--- Do.Interface.Linux.HUD/Makefile.am 2008-12-15 22:25:09 +0000
2226+++ Do.Interface.Linux.HUD/Makefile.am 2009-04-20 00:15:20 +0000
2227@@ -20,4 +20,5 @@
2228
2229 PROJECT_REFERENCES = \
2230 Do.Interface.Linux \
2231+ Do.Interface.Linux.AnimationBase \
2232 Do.Platform
2233
2234=== modified file 'Do.Interface.Linux.Mini/Do.Interface.Linux.Mini.mdp'
2235--- Do.Interface.Linux.Mini/Do.Interface.Linux.Mini.mdp 2009-01-27 03:23:24 +0000
2236+++ Do.Interface.Linux.Mini/Do.Interface.Linux.Mini.mdp 2009-04-20 00:12:53 +0000
2237@@ -1,10 +1,10 @@
2238-<Project name="Do.Interface.Linux.Mini" fileversion="2.0" language="C#" clr-version="Net_2_0" targetFramework="2.0" ctype="DotNetProject">
2239+<Project name="Do.Interface.Linux.Mini" fileversion="2.0" language="C#" clr-version="Net_2_0" targetFramework="3.5" ctype="DotNetProject">
2240 <Configurations active="Debug">
2241 <Configuration name="Debug" ctype="DotNetProjectConfiguration">
2242 <Output directory="bin/Debug" assembly="Do.Interface.Linux.Mini" />
2243 <Build debugmode="True" target="Library" />
2244 <Execution runwithwarnings="True" consolepause="False" runtime="MsNet" clr-version="Net_2_0" />
2245- <CodeGeneration compiler="Mcs" warninglevel="4" optimize="False" unsafecodeallowed="False" generateoverflowchecks="False" definesymbols="DEBUG" generatexmldocumentation="False" ctype="CSharpCompilerParameters" />
2246+ <CodeGeneration compiler="Mcs" warninglevel="4" optimize="True" unsafecodeallowed="False" generateoverflowchecks="True" definesymbols="DEBUG" generatexmldocumentation="False" ctype="CSharpCompilerParameters" />
2247 </Configuration>
2248 <Configuration name="Release" ctype="DotNetProjectConfiguration">
2249 <Output directory="bin/Release" assembly="Do.Interface.Linux.Mini" />
2250@@ -30,5 +30,6 @@
2251 <ProjectReference type="Gac" localcopy="True" refto="gdk-sharp, Version=2.12.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f" />
2252 <ProjectReference type="Project" localcopy="True" refto="Do.Platform" />
2253 <ProjectReference type="Project" localcopy="True" refto="Do.Interface.Linux" />
2254+ <ProjectReference type="Project" localcopy="True" refto="Do.Interface.Linux.AnimationBase" />
2255 </References>
2256 </Project>
2257\ No newline at end of file
2258
2259=== modified file 'Do.Interface.Linux.Mini/Makefile.am'
2260--- Do.Interface.Linux.Mini/Makefile.am 2008-12-15 22:25:09 +0000
2261+++ Do.Interface.Linux.Mini/Makefile.am 2009-04-20 00:15:20 +0000
2262@@ -20,4 +20,5 @@
2263
2264 PROJECT_REFERENCES = \
2265 Do.Interface.Linux \
2266+ Do.Interface.Linux.AnimationBase \
2267 Do.Platform
2268
2269=== modified file 'Do.Interface.Linux/Do.Interface.Linux.mdp'
2270--- Do.Interface.Linux/Do.Interface.Linux.mdp 2009-01-27 03:23:24 +0000
2271+++ Do.Interface.Linux/Do.Interface.Linux.mdp 2009-04-20 00:12:53 +0000
2272@@ -1,4 +1,4 @@
2273-<Project name="Do.Interface.Linux" fileversion="2.0" language="C#" clr-version="Net_2_0" targetFramework="2.0" ctype="DotNetProject">
2274+<Project name="Do.Interface.Linux" fileversion="2.0" language="C#" clr-version="Net_2_0" targetFramework="3.5" ctype="DotNetProject">
2275 <Configurations active="Debug">
2276 <Configuration name="Debug" ctype="DotNetProjectConfiguration">
2277 <Output directory="bin/Debug" assembly="Do.Interface.Linux" />
2278@@ -21,7 +21,6 @@
2279 <File name="Resources" subtype="Directory" buildaction="Compile" />
2280 <File name="Resources/Do.Interface.Linux.addin.xml" subtype="Code" buildaction="EmbedAsResource" />
2281 <File name="src/Do.Interface/IDoWindow.cs" subtype="Code" buildaction="Compile" />
2282- <File name="src/Do.Interface/IRenderTheme.cs" subtype="Code" buildaction="Compile" />
2283 <File name="src/Do.Interface/IconCache.cs" subtype="Code" buildaction="Compile" />
2284 <File name="src/Do.Interface/IUIContext.cs" subtype="Code" buildaction="Compile" />
2285 <File name="src/Do.Interface/ResultsWindowSelectionEventArgs.cs" subtype="Code" buildaction="Compile" />
2286@@ -39,22 +38,10 @@
2287 <File name="src/Do.Interface/Do.Interface.Widgets/TextFrame.cs" subtype="Code" buildaction="Compile" />
2288 <File name="src/Do.Interface/Do.Interface.CairoUtils" subtype="Directory" buildaction="Compile" />
2289 <File name="src/Do.Interface/Do.Interface.CairoUtils/CairoUtils.cs" subtype="Code" buildaction="Compile" />
2290- <File name="src/Do.Interface/Do.Interface.AnimationBase" subtype="Directory" buildaction="Compile" />
2291- <File name="src/Do.Interface/Do.Interface.AnimationBase/Bezel.cs" subtype="Code" buildaction="Compile" />
2292- <File name="src/Do.Interface/Do.Interface.AnimationBase/BezelColors.cs" subtype="Code" buildaction="Compile" />
2293- <File name="src/Do.Interface/Do.Interface.AnimationBase/BezelDefaults.cs" subtype="Code" buildaction="Compile" />
2294- <File name="src/Do.Interface/Do.Interface.AnimationBase/BezelDrawingArea.cs" subtype="Code" buildaction="Compile" />
2295- <File name="src/Do.Interface/Do.Interface.AnimationBase/BezelDrawingContext.cs" subtype="Code" buildaction="Compile" />
2296- <File name="src/Do.Interface/Do.Interface.AnimationBase/BezelGlassResults.cs" subtype="Code" buildaction="Compile" />
2297- <File name="src/Do.Interface/Do.Interface.AnimationBase/BezelGlassWindow.cs" subtype="Code" buildaction="Compile" />
2298- <File name="src/Do.Interface/Do.Interface.AnimationBase/BezelResultsDrawingArea.cs" subtype="Code" buildaction="Compile" />
2299- <File name="src/Do.Interface/Do.Interface.AnimationBase/TextRenderer.cs" subtype="Code" buildaction="Compile" />
2300 <File name="src/Do.Interface/IDoController.cs" subtype="Code" buildaction="Compile" />
2301 <File name="src/Do.Interface/PixbufSurfaceCache.cs" subtype="Code" buildaction="Compile" />
2302 <File name="src/Do.Interface/PositionWindow.cs" subtype="Code" buildaction="Compile" />
2303 <File name="src/Do.Interface/Util.cs" subtype="Code" buildaction="Compile" />
2304- <File name="src/Do.Interface/Do.Interface.AnimationBase/IRenderInterfaces.cs" subtype="Code" buildaction="Compile" />
2305- <File name="src/Do.Interface/Do.Interface.AnimationBase/BezelGlassRenderClasses.cs" subtype="Code" buildaction="Compile" />
2306 <File name="src/Do.Interface/SearchFinishState.cs" subtype="Code" buildaction="Compile" />
2307 <File name="Resources/settings-triangle.png" subtype="Code" buildaction="EmbedAsResource" />
2308 <File name="src/Do.Interface/InterfaceManager.cs" subtype="Code" buildaction="Compile" />
2309@@ -72,8 +59,8 @@
2310 <ProjectReference type="Gac" localcopy="True" refto="Mono.Cairo, Version=2.0.0.0, Culture=neutral, PublicKeyToken=0738eb9f132ed756" />
2311 <ProjectReference type="Gac" localcopy="True" refto="pango-sharp, Version=2.12.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f" />
2312 <ProjectReference type="Gac" localcopy="True" refto="glib-sharp, Version=2.12.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f" />
2313- <ProjectReference type="Gac" localcopy="True" refto="gconf-sharp, Version=2.20.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f" />
2314 <ProjectReference type="Gac" localcopy="True" refto="System.Core, Version=3.5.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
2315 <ProjectReference type="Gac" localcopy="True" refto="Mono.Addins, Version=0.3.0.0, Culture=neutral, PublicKeyToken=0738eb9f132ed756" />
2316+ <ProjectReference type="Gac" localcopy="True" refto="gconf-sharp, Version=2.12.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f" />
2317 </References>
2318-</Project>
2319\ No newline at end of file
2320+</Project>
2321
2322=== modified file 'Do.Interface.Linux/Makefile.am'
2323--- Do.Interface.Linux/Makefile.am 2009-01-05 21:11:58 +0000
2324+++ Do.Interface.Linux/Makefile.am 2009-04-20 00:24:22 +0000
2325@@ -8,17 +8,6 @@
2326 FILES = \
2327 src/AssemblyInfo.cs \
2328 src/Do.Interface/ClassicInterface/ClassicWindow.cs \
2329- src/Do.Interface/Do.Interface.AnimationBase/Bezel.cs \
2330- src/Do.Interface/Do.Interface.AnimationBase/BezelColors.cs \
2331- src/Do.Interface/Do.Interface.AnimationBase/BezelDefaults.cs \
2332- src/Do.Interface/Do.Interface.AnimationBase/BezelDrawingArea.cs \
2333- src/Do.Interface/Do.Interface.AnimationBase/BezelDrawingContext.cs \
2334- src/Do.Interface/Do.Interface.AnimationBase/BezelGlassRenderClasses.cs \
2335- src/Do.Interface/Do.Interface.AnimationBase/BezelGlassResults.cs \
2336- src/Do.Interface/Do.Interface.AnimationBase/BezelGlassWindow.cs \
2337- src/Do.Interface/Do.Interface.AnimationBase/BezelResultsDrawingArea.cs \
2338- src/Do.Interface/Do.Interface.AnimationBase/TextRenderer.cs \
2339- src/Do.Interface/Do.Interface.AnimationBase/IRenderInterfaces.cs \
2340 src/Do.Interface/Do.Interface.CairoUtils/CairoUtils.cs \
2341 src/Do.Interface/Do.Interface.Widgets/DefaultElements.cs \
2342 src/Do.Interface/Do.Interface.Widgets/Frame.cs \
2343@@ -30,7 +19,6 @@
2344 src/Do.Interface/Do.Interface.Widgets/TextFrame.cs \
2345 src/Do.Interface/IDoController.cs \
2346 src/Do.Interface/IDoWindow.cs \
2347- src/Do.Interface/IRenderTheme.cs \
2348 src/Do.Interface/IUIContext.cs \
2349 src/Do.Interface/IconCache.cs \
2350 src/Do.Interface/IconProvider.cs \
2351
2352=== modified file 'Do.Interface.Wink/Do.Interface.Wink.mdp'
2353--- Do.Interface.Wink/Do.Interface.Wink.mdp 2009-04-09 02:27:52 +0000
2354+++ Do.Interface.Wink/Do.Interface.Wink.mdp 2009-04-19 06:40:08 +0000
2355@@ -5,7 +5,7 @@
2356 <Build debugmode="True" target="Library" />
2357 <Execution runwithwarnings="True" consolepause="False" runtime="MsNet" />
2358 <EnvironmentVariables />
2359- <CodeGeneration compiler="Mcs" warninglevel="4" optimize="False" unsafecodeallowed="False" generateoverflowchecks="False" definesymbols="DEBUG" generatexmldocumentation="False" ctype="CSharpCompilerParameters" />
2360+ <CodeGeneration compiler="Mcs" warninglevel="4" optimize="True" unsafecodeallowed="False" generateoverflowchecks="True" definesymbols="DEBUG" generatexmldocumentation="False" ctype="CSharpCompilerParameters" />
2361 </Configuration>
2362 <Configuration name="Release" ctype="DotNetProjectConfiguration">
2363 <Output directory="bin/Release" assembly="Do.Interface.Wnck" />
2364
2365=== modified file 'Do.Interface.Wink/src/Do.Interface.Wink/Viewport.cs'
2366--- Do.Interface.Wink/src/Do.Interface.Wink/Viewport.cs 2009-04-09 02:32:20 +0000
2367+++ Do.Interface.Wink/src/Do.Interface.Wink/Viewport.cs 2009-04-21 04:12:30 +0000
2368@@ -48,18 +48,10 @@
2369
2370 public string Name { get; private set; }
2371
2372- internal Rectangle Area {
2373+ public Rectangle Area {
2374 get { return area; }
2375 }
2376
2377- internal Viewport(string name, Rectangle area, Workspace parent)
2378- {
2379- this.area = area;
2380- this.parent = parent;
2381- Name = name;
2382- window_states = new Dictionary<Wnck.Window, WindowState> ();
2383- }
2384-
2385 WindowMoveResizeMask MoveMask {
2386 get {
2387 return WindowMoveResizeMask.X | WindowMoveResizeMask.Y;
2388@@ -81,6 +73,19 @@
2389 }
2390 }
2391
2392+ internal Viewport(string name, Rectangle area, Workspace parent)
2393+ {
2394+ this.area = area;
2395+ this.parent = parent;
2396+ Name = name;
2397+ window_states = new Dictionary<Wnck.Window, WindowState> ();
2398+ }
2399+
2400+ public void Present ()
2401+ {
2402+ parent.Screen.MoveViewport (area.X, area.Y);
2403+ }
2404+
2405 public bool Contains (Gdk.Point point)
2406 {
2407 return area.Contains (point);
2408
2409=== modified file 'Do.Platform.Linux/Do.Platform.Linux.mdp'
2410--- Do.Platform.Linux/Do.Platform.Linux.mdp 2009-02-17 23:43:18 +0000
2411+++ Do.Platform.Linux/Do.Platform.Linux.mdp 2009-04-20 00:12:53 +0000
2412@@ -1,10 +1,10 @@
2413-<Project name="Do.Platform.Linux" fileversion="2.0" language="C#" clr-version="Net_2_0" targetFramework="2.0" ctype="DotNetProject">
2414+<Project name="Do.Platform.Linux" fileversion="2.0" language="C#" clr-version="Net_2_0" targetFramework="3.5" ctype="DotNetProject">
2415 <Configurations active="Debug">
2416 <Configuration name="Debug" ctype="DotNetProjectConfiguration">
2417 <Output directory="bin/Debug" assembly="Do.Platform.Linux" />
2418 <Build debugmode="True" target="Library" />
2419 <Execution runwithwarnings="True" consolepause="False" runtime="MsNet" clr-version="Net_2_0" />
2420- <CodeGeneration compiler="Mcs" warninglevel="4" optimize="False" unsafecodeallowed="False" generateoverflowchecks="False" definesymbols="DEBUG" generatexmldocumentation="False" ctype="CSharpCompilerParameters" />
2421+ <CodeGeneration compiler="Mcs" warninglevel="4" optimize="True" unsafecodeallowed="False" generateoverflowchecks="True" definesymbols="DEBUG" generatexmldocumentation="False" ctype="CSharpCompilerParameters" />
2422 </Configuration>
2423 <Configuration name="Release" ctype="DotNetProjectConfiguration">
2424 <Output directory="bin/Release" assembly="Do.Platform.Linux" />
2425@@ -59,7 +59,6 @@
2426 <ProjectReference type="Gac" localcopy="True" refto="System.Core, Version=3.5.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
2427 <ProjectReference type="Gac" localcopy="True" refto="notify-sharp, Version=0.4.0.0, Culture=neutral, PublicKeyToken=2df29c54e245917a" />
2428 <ProjectReference type="Gac" localcopy="True" refto="glib-sharp, Version=2.12.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f" />
2429- <ProjectReference type="Project" localcopy="True" refto="Do.Interface.Linux" />
2430 <ProjectReference type="Project" localcopy="True" refto="Do.Universe" />
2431 <ProjectReference type="Gac" localcopy="True" refto="Gnome.Keyring, Version=1.0.0.0, Culture=neutral, PublicKeyToken=1a73e1bde00c9b66" />
2432 <ProjectReference type="Gac" localcopy="True" refto="nunit.framework, Version=2.2.0.0, Culture=neutral, PublicKeyToken=96d09a1eb7f44a77" />
2433@@ -67,5 +66,6 @@
2434 <ProjectReference type="Gac" localcopy="True" refto="gconf-sharp, Version=2.12.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f" />
2435 <ProjectReference type="Gac" localcopy="True" refto="NDesk.DBus, Version=1.0.0.0, Culture=neutral, PublicKeyToken=f6716e4f9b2ed099" />
2436 <ProjectReference type="Gac" localcopy="True" refto="NDesk.DBus.GLib, Version=1.0.0.0, Culture=neutral, PublicKeyToken=f6716e4f9b2ed099" />
2437+ <ProjectReference type="Project" localcopy="True" refto="Do.Interface.Linux" />
2438 </References>
2439 </Project>
2440\ No newline at end of file
2441
2442=== modified file 'Do.Platform.OSX/Do.Platform.OSX.mdp'
2443--- Do.Platform.OSX/Do.Platform.OSX.mdp 2009-01-27 03:23:24 +0000
2444+++ Do.Platform.OSX/Do.Platform.OSX.mdp 2009-04-19 06:40:08 +0000
2445@@ -4,7 +4,7 @@
2446 <Output directory="bin/Debug" assembly="Do.Platform.OSX" />
2447 <Build debugmode="True" target="Library" />
2448 <Execution runwithwarnings="True" consolepause="False" runtime="MsNet" clr-version="Net_2_0" />
2449- <CodeGeneration compiler="Mcs" warninglevel="4" optimize="False" unsafecodeallowed="False" generateoverflowchecks="False" definesymbols="DEBUG" generatexmldocumentation="False" ctype="CSharpCompilerParameters" />
2450+ <CodeGeneration compiler="Mcs" warninglevel="4" optimize="True" unsafecodeallowed="False" generateoverflowchecks="True" definesymbols="DEBUG" generatexmldocumentation="False" ctype="CSharpCompilerParameters" />
2451 </Configuration>
2452 <Configuration name="Release" ctype="DotNetProjectConfiguration">
2453 <Output directory="bin/Release" assembly="Do.Platform.OSX" />
2454
2455=== modified file 'Do.Platform.Windows/Do.Platform.Windows.mdp'
2456--- Do.Platform.Windows/Do.Platform.Windows.mdp 2009-01-27 03:23:24 +0000
2457+++ Do.Platform.Windows/Do.Platform.Windows.mdp 2009-04-19 06:40:08 +0000
2458@@ -4,7 +4,7 @@
2459 <Output directory="bin/Debug" assembly="Do.Platform.Windows" />
2460 <Build debugmode="True" target="Library" />
2461 <Execution runwithwarnings="True" consolepause="False" runtime="MsNet" clr-version="Net_2_0" />
2462- <CodeGeneration compiler="Mcs" warninglevel="4" optimize="False" unsafecodeallowed="False" generateoverflowchecks="False" definesymbols="DEBUG" generatexmldocumentation="False" ctype="CSharpCompilerParameters" />
2463+ <CodeGeneration compiler="Mcs" warninglevel="4" optimize="True" unsafecodeallowed="False" generateoverflowchecks="True" definesymbols="DEBUG" generatexmldocumentation="False" ctype="CSharpCompilerParameters" />
2464 </Configuration>
2465 <Configuration name="Release" ctype="DotNetProjectConfiguration">
2466 <Output directory="bin/Release" assembly="Do.Platform.Windows" />
2467
2468=== modified file 'Do.Platform/Do.Platform.mdp'
2469--- Do.Platform/Do.Platform.mdp 2009-02-17 23:43:18 +0000
2470+++ Do.Platform/Do.Platform.mdp 2009-04-19 06:40:08 +0000
2471@@ -1,10 +1,10 @@
2472-<Project name="Do.Platform" fileversion="2.0" language="C#" clr-version="Net_2_0" targetFramework="2.0" ctype="DotNetProject">
2473+<Project name="Do.Platform" fileversion="2.0" language="C#" clr-version="Net_2_0" targetFramework="3.5" ctype="DotNetProject">
2474 <Configurations active="Debug">
2475 <Configuration name="Debug" ctype="DotNetProjectConfiguration">
2476 <Output directory="bin/Debug" assembly="Do.Platform" />
2477 <Build debugmode="True" target="Library" />
2478 <Execution runwithwarnings="True" consolepause="False" runtime="MsNet" clr-version="Net_2_0" />
2479- <CodeGeneration compiler="Mcs" warninglevel="4" optimize="False" unsafecodeallowed="False" generateoverflowchecks="False" definesymbols="DEBUG" generatexmldocumentation="False" ctype="CSharpCompilerParameters" />
2480+ <CodeGeneration compiler="Mcs" warninglevel="4" optimize="True" unsafecodeallowed="False" generateoverflowchecks="True" definesymbols="DEBUG" generatexmldocumentation="False" ctype="CSharpCompilerParameters" />
2481 </Configuration>
2482 <Configuration name="Release" ctype="DotNetProjectConfiguration">
2483 <Output directory="bin/Release" assembly="Do.Platform" />
2484@@ -76,7 +76,6 @@
2485 <File name="src/System/Linq/EnumerableExtensions.cs" subtype="Code" buildaction="Compile" />
2486 <File name="src/Do.Platform/AbstractSystemService.cs" subtype="Code" buildaction="Compile" />
2487 <File name="src/Do.Platform/Do.Platform.Default/DefaultSystemService.cs" subtype="Code" buildaction="Compile" />
2488- <File name="src/Do.Platform/IAutostartService.cs" subtype="Code" buildaction="Compile" />
2489 </Contents>
2490 <References>
2491 <ProjectReference type="Gac" localcopy="True" refto="System, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
2492
2493=== modified file 'Do.Universe/Do.Universe.mdp'
2494--- Do.Universe/Do.Universe.mdp 2009-01-27 03:23:24 +0000
2495+++ Do.Universe/Do.Universe.mdp 2009-04-19 06:40:08 +0000
2496@@ -1,10 +1,10 @@
2497-<Project name="Do.Universe" fileversion="2.0" language="C#" clr-version="Net_2_0" targetFramework="2.0" ctype="DotNetProject">
2498+<Project name="Do.Universe" fileversion="2.0" language="C#" clr-version="Net_2_0" targetFramework="3.5" ctype="DotNetProject">
2499 <Configurations active="Debug">
2500 <Configuration name="Debug" ctype="DotNetProjectConfiguration">
2501 <Output directory="bin/Debug" assembly="Do.Universe" />
2502 <Build debugmode="True" target="Library" />
2503 <Execution runwithwarnings="True" consolepause="False" runtime="MsNet" clr-version="Net_2_0" />
2504- <CodeGeneration compiler="Mcs" warninglevel="4" optimize="False" unsafecodeallowed="False" generateoverflowchecks="False" definesymbols="DEBUG" generatexmldocumentation="False" ctype="CSharpCompilerParameters" />
2505+ <CodeGeneration compiler="Mcs" warninglevel="4" optimize="True" unsafecodeallowed="False" generateoverflowchecks="True" definesymbols="DEBUG" generatexmldocumentation="False" ctype="CSharpCompilerParameters" />
2506 </Configuration>
2507 <Configuration name="Release" ctype="DotNetProjectConfiguration">
2508 <Output directory="bin/Release" assembly="Do.Universe" />
2509@@ -49,6 +49,5 @@
2510 <ProjectReference type="Gac" localcopy="True" refto="System.Core, Version=3.5.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
2511 <ProjectReference type="Gac" localcopy="True" refto="gtk-sharp, Version=2.12.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f" />
2512 <ProjectReference type="Gac" localcopy="True" refto="gdk-sharp, Version=2.12.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f" />
2513- <ProjectReference type="Gac" localcopy="True" refto="Do.Platform, Version=0.8.0.0, Culture=neutral, PublicKeyToken=null" />
2514 </References>
2515 </Project>
2516\ No newline at end of file
2517
2518=== modified file 'Do.mds'
2519--- Do.mds 2009-03-31 17:48:02 +0000
2520+++ Do.mds 2009-04-19 22:16:43 +0000
2521@@ -14,6 +14,7 @@
2522 <Entry build="True" name="Do.Interface.Linux.Mini" configuration="Debug" />
2523 <Entry build="True" name="Do.Interface.Linux.HUD" configuration="Debug" />
2524 <Entry build="True" name="Do.Interface.Wink" configuration="Debug" />
2525+ <Entry build="True" name="Do.Interface.Linux.AnimationBase" configuration="Debug" />
2526 </Configuration>
2527 <Configuration name="Release" ctype="CombineConfiguration">
2528 <Entry build="True" name="Do" configuration="Release" />
2529@@ -29,6 +30,7 @@
2530 <Entry build="True" name="Do.Interface.Linux.Mini" configuration="Release" />
2531 <Entry build="True" name="Do.Interface.Linux.HUD" configuration="Release" />
2532 <Entry build="True" name="Do.Interface.Wink" configuration="Release" />
2533+ <Entry build="True" name="Do.Interface.Linux.AnimationBase" configuration="Release" />
2534 <CustomCommands>
2535 <Command type="BeforeBuild" command="autogen.sh --enable-release=YES" workingdir="${CombineDir}" />
2536 </CustomCommands>
2537@@ -48,6 +50,7 @@
2538 <Execute type="None" entry="Do.Interface.Linux.Mini" />
2539 <Execute type="None" entry="Do.Interface.Linux.HUD" />
2540 <Execute type="None" entry="Do.Interface.Wink" />
2541+ <Execute type="None" entry="Do.Interface.Linux.AnimationBase" />
2542 </StartMode>
2543 <Entries>
2544 <Entry filename="Do/Do.mdp" />
2545@@ -63,5 +66,6 @@
2546 <Entry filename="Do.Interface.Linux.Mini/Do.Interface.Linux.Mini.mdp" />
2547 <Entry filename="Do.Interface.Linux.HUD/Do.Interface.Linux.HUD.mdp" />
2548 <Entry filename="Do.Interface.Wink/Do.Interface.Wink.mdp" />
2549+ <Entry filename="Do.Interface.Linux.AnimationBase/Do.Interface.Linux.AnimationBase.mdp" />
2550 </Entries>
2551 </Combine>
2552\ No newline at end of file
2553
2554=== modified file 'Do/Do.mdp'
2555--- Do/Do.mdp 2009-04-18 03:12:46 +0000
2556+++ Do/Do.mdp 2009-04-20 00:12:53 +0000
2557@@ -1,17 +1,17 @@
2558-<Project name="Do" fileversion="2.0" language="C#" clr-version="Net_2_0" targetFramework="2.0" ctype="DotNetProject">
2559+<Project name="Do" fileversion="2.0" language="C#" clr-version="Net_2_0" targetFramework="3.5" ctype="DotNetProject">
2560 <Configurations active="Debug">
2561 <Configuration name="Debug" ctype="DotNetProjectConfiguration">
2562 <Output directory="bin/Debug" assemblyKeyFile="." assembly="Do" />
2563 <Build debugmode="True" target="Exe" />
2564 <Execution runwithwarnings="True" commandlineparameters="--debug" externalconsole="True" consolepause="True" runtime="MsNet" clr-version="Net_2_0" />
2565 <EnvironmentVariables />
2566- <CodeGeneration compiler="Mcs" warninglevel="4" optimize="True" unsafecodeallowed="False" generateoverflowchecks="True" generatexmldocumentation="False" ctype="CSharpCompilerParameters" />
2567+ <CodeGeneration compiler="Mcs" warninglevel="4" optimize="True" unsafecodeallowed="True" generateoverflowchecks="True" generatexmldocumentation="False" ctype="CSharpCompilerParameters" />
2568 </Configuration>
2569 <Configuration name="Release" ctype="DotNetProjectConfiguration">
2570 <Output directory="bin/Release" assembly="Do" />
2571 <Build debugmode="False" target="Exe" />
2572 <Execution runwithwarnings="True" consolepause="True" runtime="MsNet" clr-version="Net_2_0" />
2573- <CodeGeneration compiler="Mcs" warninglevel="4" optimize="True" unsafecodeallowed="False" generateoverflowchecks="True" generatexmldocumentation="False" ctype="CSharpCompilerParameters" />
2574+ <CodeGeneration compiler="Mcs" warninglevel="4" optimize="True" unsafecodeallowed="True" generateoverflowchecks="True" generatexmldocumentation="False" ctype="CSharpCompilerParameters" />
2575 </Configuration>
2576 </Configurations>
2577 <Contents>
2578@@ -86,6 +86,9 @@
2579 <File name="src/Do.Core/Do.Core.Addins/CommunityAddinClassifier.cs" subtype="Code" buildaction="Compile" />
2580 <File name="src/Do.UI/SearchEntry.cs" subtype="Code" buildaction="Compile" />
2581 <File name="src/Do.UI/HoverImageButton.cs" subtype="Code" buildaction="Compile" />
2582+ <File name="src/CoreKeybindings.cs" subtype="Code" buildaction="Compile" />
2583+ <File name="src/Do.Core/Shortcut.cs" subtype="Code" buildaction="Compile" />
2584+ <File name="src/Do.Core/ShortcutCallback.cs" subtype="Code" buildaction="Compile" />
2585 </Contents>
2586 <References>
2587 <ProjectReference type="Gac" localcopy="True" refto="System, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
2588@@ -101,6 +104,7 @@
2589 <ProjectReference type="Project" localcopy="True" refto="Do.Interface.Linux" />
2590 <ProjectReference type="Project" localcopy="True" refto="Do.Universe" />
2591 <ProjectReference type="Gac" localcopy="True" refto="glib-sharp, Version=2.12.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f" />
2592+ <ProjectReference type="Project" localcopy="True" refto="Do.Interface.Linux.AnimationBase" />
2593 </References>
2594 <LanguageParameters ApplicationIcon="../../../../../jason/do/trunk-merge/Do" ctype="CSharpProjectParameters" />
2595 <Deployment.LinuxDeployData scriptName="gnome-do" />
2596
2597=== modified file 'Do/Makefile.am'
2598--- Do/Makefile.am 2009-03-22 05:41:46 +0000
2599+++ Do/Makefile.am 2009-04-20 00:12:53 +0000
2600@@ -94,7 +94,8 @@
2601 Do.Universe \
2602 Do.Platform \
2603 Do.Platform.Linux \
2604- Do.Interface.Linux
2605+ Do.Interface.Linux \
2606+ Do.Interface.Linux.AnimationBase
2607
2608 #
2609 # Extra rules for our binary, not worth factoring out
2610
2611=== modified file 'Do/gtk-gui/Do.UI.ColorConfigurationWidget.cs'
2612--- Do/gtk-gui/Do.UI.ColorConfigurationWidget.cs 2009-02-06 21:55:49 +0000
2613+++ Do/gtk-gui/Do.UI.ColorConfigurationWidget.cs 2009-04-21 02:15:39 +0000
2614@@ -23,22 +23,12 @@
2615
2616 private Gtk.VBox vbox1;
2617
2618- private Gtk.Alignment alignment1;
2619-
2620- private Gtk.Table table1;
2621-
2622- private Gtk.HBox hbox3;
2623-
2624- private Gtk.ColorButton background_colorbutton;
2625-
2626- private Gtk.Button clear_background;
2627-
2628- private Gtk.Label label8;
2629+ private Gtk.HBox hbox4;
2630+
2631+ private Gtk.Label theme_lbl;
2632
2633 private Gtk.ComboBox theme_combo;
2634
2635- private Gtk.Label theme_lbl;
2636-
2637 private Gtk.VBox vbox3;
2638
2639 private Gtk.VBox vbox4;
2640@@ -47,9 +37,9 @@
2641
2642 private Gtk.CheckButton pin_check;
2643
2644- private Gtk.CheckButton shadow_check;
2645+ private Gtk.Alignment theme_configuration_container;
2646
2647- private Gtk.CheckButton animation_check;
2648+ private Gtk.HSeparator hseparator1;
2649
2650 private Gtk.VBox composite_warning_widget;
2651
2652@@ -87,98 +77,33 @@
2653 this.vbox1.Name = "vbox1";
2654 this.vbox1.Spacing = 6;
2655 // Container child vbox1.Gtk.Box+BoxChild
2656- this.alignment1 = new Gtk.Alignment(0.5F, 0.5F, 1F, 1F);
2657- this.alignment1.Name = "alignment1";
2658- // Container child alignment1.Gtk.Container+ContainerChild
2659- this.table1 = new Gtk.Table(((uint)(2)), ((uint)(3)), false);
2660- this.table1.Name = "table1";
2661- this.table1.RowSpacing = ((uint)(6));
2662- this.table1.ColumnSpacing = ((uint)(16));
2663- // Container child table1.Gtk.Table+TableChild
2664- this.hbox3 = new Gtk.HBox();
2665- this.hbox3.Name = "hbox3";
2666- this.hbox3.Spacing = 6;
2667- // Container child hbox3.Gtk.Box+BoxChild
2668- this.background_colorbutton = new Gtk.ColorButton();
2669- this.background_colorbutton.CanFocus = true;
2670- this.background_colorbutton.Events = ((Gdk.EventMask)(784));
2671- this.background_colorbutton.Name = "background_colorbutton";
2672- this.background_colorbutton.UseAlpha = true;
2673- this.background_colorbutton.Alpha = 65535;
2674- this.hbox3.Add(this.background_colorbutton);
2675- Gtk.Box.BoxChild w1 = ((Gtk.Box.BoxChild)(this.hbox3[this.background_colorbutton]));
2676- w1.Position = 0;
2677- // Container child hbox3.Gtk.Box+BoxChild
2678- this.clear_background = new Gtk.Button();
2679- this.clear_background.CanFocus = true;
2680- this.clear_background.Name = "clear_background";
2681- this.clear_background.UseUnderline = true;
2682- this.clear_background.Relief = ((Gtk.ReliefStyle)(2));
2683- // Container child clear_background.Gtk.Container+ContainerChild
2684- Gtk.Alignment w2 = new Gtk.Alignment(0.5F, 0.5F, 0F, 0F);
2685- // Container child GtkAlignment.Gtk.Container+ContainerChild
2686- Gtk.HBox w3 = new Gtk.HBox();
2687- w3.Spacing = 2;
2688- // Container child GtkHBox.Gtk.Container+ContainerChild
2689- Gtk.Image w4 = new Gtk.Image();
2690- w4.Pixbuf = Stetic.IconLoader.LoadIcon(this, "gtk-clear", Gtk.IconSize.Menu, 16);
2691- w3.Add(w4);
2692- // Container child GtkHBox.Gtk.Container+ContainerChild
2693- Gtk.Label w6 = new Gtk.Label();
2694- w6.LabelProp = Mono.Unix.Catalog.GetString("_Reset");
2695- w6.UseUnderline = true;
2696- w3.Add(w6);
2697- w2.Add(w3);
2698- this.clear_background.Add(w2);
2699- this.hbox3.Add(this.clear_background);
2700- Gtk.Box.BoxChild w10 = ((Gtk.Box.BoxChild)(this.hbox3[this.clear_background]));
2701- w10.Position = 1;
2702- w10.Expand = false;
2703- w10.Fill = false;
2704- this.table1.Add(this.hbox3);
2705- Gtk.Table.TableChild w11 = ((Gtk.Table.TableChild)(this.table1[this.hbox3]));
2706- w11.TopAttach = ((uint)(1));
2707- w11.BottomAttach = ((uint)(2));
2708- w11.LeftAttach = ((uint)(1));
2709- w11.RightAttach = ((uint)(2));
2710- w11.XOptions = ((Gtk.AttachOptions)(4));
2711- w11.YOptions = ((Gtk.AttachOptions)(4));
2712- // Container child table1.Gtk.Table+TableChild
2713- this.label8 = new Gtk.Label();
2714- this.label8.Name = "label8";
2715- this.label8.Xalign = 0F;
2716- this.label8.LabelProp = Mono.Unix.Catalog.GetString("Background Color:");
2717- this.table1.Add(this.label8);
2718- Gtk.Table.TableChild w12 = ((Gtk.Table.TableChild)(this.table1[this.label8]));
2719- w12.TopAttach = ((uint)(1));
2720- w12.BottomAttach = ((uint)(2));
2721- w12.XOptions = ((Gtk.AttachOptions)(4));
2722- w12.YOptions = ((Gtk.AttachOptions)(4));
2723- // Container child table1.Gtk.Table+TableChild
2724- this.theme_combo = Gtk.ComboBox.NewText();
2725- this.theme_combo.Name = "theme_combo";
2726- this.table1.Add(this.theme_combo);
2727- Gtk.Table.TableChild w13 = ((Gtk.Table.TableChild)(this.table1[this.theme_combo]));
2728- w13.LeftAttach = ((uint)(1));
2729- w13.RightAttach = ((uint)(2));
2730- w13.XOptions = ((Gtk.AttachOptions)(4));
2731- w13.YOptions = ((Gtk.AttachOptions)(4));
2732- // Container child table1.Gtk.Table+TableChild
2733+ this.hbox4 = new Gtk.HBox();
2734+ this.hbox4.Name = "hbox4";
2735+ this.hbox4.Spacing = 6;
2736+ // Container child hbox4.Gtk.Box+BoxChild
2737 this.theme_lbl = new Gtk.Label();
2738 this.theme_lbl.Name = "theme_lbl";
2739 this.theme_lbl.Xalign = 0F;
2740 this.theme_lbl.LabelProp = Mono.Unix.Catalog.GetString("_Theme:");
2741 this.theme_lbl.UseUnderline = true;
2742- this.table1.Add(this.theme_lbl);
2743- Gtk.Table.TableChild w14 = ((Gtk.Table.TableChild)(this.table1[this.theme_lbl]));
2744- w14.XOptions = ((Gtk.AttachOptions)(4));
2745- w14.YOptions = ((Gtk.AttachOptions)(4));
2746- this.alignment1.Add(this.table1);
2747- this.vbox1.Add(this.alignment1);
2748- Gtk.Box.BoxChild w16 = ((Gtk.Box.BoxChild)(this.vbox1[this.alignment1]));
2749- w16.Position = 0;
2750- w16.Expand = false;
2751- w16.Fill = false;
2752+ this.hbox4.Add(this.theme_lbl);
2753+ Gtk.Box.BoxChild w1 = ((Gtk.Box.BoxChild)(this.hbox4[this.theme_lbl]));
2754+ w1.Position = 0;
2755+ w1.Expand = false;
2756+ w1.Fill = false;
2757+ // Container child hbox4.Gtk.Box+BoxChild
2758+ this.theme_combo = Gtk.ComboBox.NewText();
2759+ this.theme_combo.Name = "theme_combo";
2760+ this.hbox4.Add(this.theme_combo);
2761+ Gtk.Box.BoxChild w2 = ((Gtk.Box.BoxChild)(this.hbox4[this.theme_combo]));
2762+ w2.Position = 1;
2763+ w2.Expand = false;
2764+ w2.Fill = false;
2765+ this.vbox1.Add(this.hbox4);
2766+ Gtk.Box.BoxChild w3 = ((Gtk.Box.BoxChild)(this.vbox1[this.hbox4]));
2767+ w3.Position = 0;
2768+ w3.Expand = false;
2769+ w3.Fill = false;
2770 // Container child vbox1.Gtk.Box+BoxChild
2771 this.vbox3 = new Gtk.VBox();
2772 this.vbox3.Name = "vbox3";
2773@@ -201,56 +126,50 @@
2774 this.pin_check.DrawIndicator = true;
2775 this.pin_check.UseUnderline = true;
2776 this.hbox2.Add(this.pin_check);
2777- Gtk.Box.BoxChild w17 = ((Gtk.Box.BoxChild)(this.hbox2[this.pin_check]));
2778- w17.Position = 0;
2779+ Gtk.Box.BoxChild w4 = ((Gtk.Box.BoxChild)(this.hbox2[this.pin_check]));
2780+ w4.Position = 0;
2781 this.vbox4.Add(this.hbox2);
2782- Gtk.Box.BoxChild w18 = ((Gtk.Box.BoxChild)(this.vbox4[this.hbox2]));
2783- w18.Position = 0;
2784- w18.Expand = false;
2785- w18.Fill = false;
2786- // Container child vbox4.Gtk.Box+BoxChild
2787- this.shadow_check = new Gtk.CheckButton();
2788- this.shadow_check.CanFocus = true;
2789- this.shadow_check.Name = "shadow_check";
2790- this.shadow_check.Label = Mono.Unix.Catalog.GetString("Show window shadow");
2791- this.shadow_check.DrawIndicator = true;
2792- this.shadow_check.UseUnderline = true;
2793- this.vbox4.Add(this.shadow_check);
2794- Gtk.Box.BoxChild w19 = ((Gtk.Box.BoxChild)(this.vbox4[this.shadow_check]));
2795- w19.Position = 1;
2796- w19.Expand = false;
2797- w19.Fill = false;
2798- // Container child vbox4.Gtk.Box+BoxChild
2799- this.animation_check = new Gtk.CheckButton();
2800- this.animation_check.CanFocus = true;
2801- this.animation_check.Name = "animation_check";
2802- this.animation_check.Label = Mono.Unix.Catalog.GetString("Animate window");
2803- this.animation_check.Active = true;
2804- this.animation_check.DrawIndicator = true;
2805- this.animation_check.UseUnderline = true;
2806- this.vbox4.Add(this.animation_check);
2807- Gtk.Box.BoxChild w20 = ((Gtk.Box.BoxChild)(this.vbox4[this.animation_check]));
2808- w20.Position = 2;
2809- w20.Expand = false;
2810- w20.Fill = false;
2811+ Gtk.Box.BoxChild w5 = ((Gtk.Box.BoxChild)(this.vbox4[this.hbox2]));
2812+ w5.Position = 0;
2813+ w5.Expand = false;
2814+ w5.Fill = false;
2815 this.vbox3.Add(this.vbox4);
2816- Gtk.Box.BoxChild w21 = ((Gtk.Box.BoxChild)(this.vbox3[this.vbox4]));
2817- w21.Position = 0;
2818- w21.Expand = false;
2819- w21.Fill = false;
2820+ Gtk.Box.BoxChild w6 = ((Gtk.Box.BoxChild)(this.vbox3[this.vbox4]));
2821+ w6.Position = 0;
2822+ w6.Expand = false;
2823+ w6.Fill = false;
2824 this.vbox1.Add(this.vbox3);
2825- Gtk.Box.BoxChild w22 = ((Gtk.Box.BoxChild)(this.vbox1[this.vbox3]));
2826- w22.Position = 1;
2827- w22.Expand = false;
2828- w22.Fill = false;
2829+ Gtk.Box.BoxChild w7 = ((Gtk.Box.BoxChild)(this.vbox1[this.vbox3]));
2830+ w7.Position = 1;
2831+ w7.Expand = false;
2832+ w7.Fill = false;
2833 this.alignment2.Add(this.vbox1);
2834 this.GtkAlignment.Add(this.alignment2);
2835 this.frame1.Add(this.GtkAlignment);
2836 this.vbox2.Add(this.frame1);
2837- Gtk.Box.BoxChild w26 = ((Gtk.Box.BoxChild)(this.vbox2[this.frame1]));
2838- w26.Position = 0;
2839- w26.Expand = false;
2840- w26.Fill = false;
2841+ Gtk.Box.BoxChild w11 = ((Gtk.Box.BoxChild)(this.vbox2[this.frame1]));
2842+ w11.Position = 0;
2843+ w11.Expand = false;
2844+ w11.Fill = false;
2845+ // Container child vbox2.Gtk.Box+BoxChild
2846+ this.theme_configuration_container = new Gtk.Alignment(0.5F, 0.5F, 1F, 1F);
2847+ this.theme_configuration_container.Name = "theme_configuration_container";
2848+ this.theme_configuration_container.LeftPadding = ((uint)(6));
2849+ this.theme_configuration_container.RightPadding = ((uint)(6));
2850+ this.theme_configuration_container.BottomPadding = ((uint)(3));
2851+ this.vbox2.Add(this.theme_configuration_container);
2852+ Gtk.Box.BoxChild w12 = ((Gtk.Box.BoxChild)(this.vbox2[this.theme_configuration_container]));
2853+ w12.PackType = ((Gtk.PackType)(1));
2854+ w12.Position = 1;
2855+ // Container child vbox2.Gtk.Box+BoxChild
2856+ this.hseparator1 = new Gtk.HSeparator();
2857+ this.hseparator1.Name = "hseparator1";
2858+ this.vbox2.Add(this.hseparator1);
2859+ Gtk.Box.BoxChild w13 = ((Gtk.Box.BoxChild)(this.vbox2[this.hseparator1]));
2860+ w13.PackType = ((Gtk.PackType)(1));
2861+ w13.Position = 2;
2862+ w13.Expand = false;
2863+ w13.Fill = false;
2864 // Container child vbox2.Gtk.Box+BoxChild
2865 this.composite_warning_widget = new Gtk.VBox();
2866 this.composite_warning_widget.Name = "composite_warning_widget";
2867@@ -262,10 +181,10 @@
2868 this.label1.UseMarkup = true;
2869 this.label1.Wrap = true;
2870 this.composite_warning_widget.Add(this.label1);
2871- Gtk.Box.BoxChild w27 = ((Gtk.Box.BoxChild)(this.composite_warning_widget[this.label1]));
2872- w27.Position = 0;
2873- w27.Expand = false;
2874- w27.Fill = false;
2875+ Gtk.Box.BoxChild w14 = ((Gtk.Box.BoxChild)(this.composite_warning_widget[this.label1]));
2876+ w14.Position = 0;
2877+ w14.Expand = false;
2878+ w14.Fill = false;
2879 // Container child composite_warning_widget.Gtk.Box+BoxChild
2880 this.hbuttonbox1 = new Gtk.HButtonBox();
2881 this.hbuttonbox1.LayoutStyle = ((Gtk.ButtonBoxStyle)(4));
2882@@ -277,18 +196,20 @@
2883 this.composite_warning_info_btn.UseUnderline = true;
2884 this.composite_warning_info_btn.Label = "gtk-dialog-info";
2885 this.hbuttonbox1.Add(this.composite_warning_info_btn);
2886- Gtk.ButtonBox.ButtonBoxChild w28 = ((Gtk.ButtonBox.ButtonBoxChild)(this.hbuttonbox1[this.composite_warning_info_btn]));
2887- w28.Expand = false;
2888- w28.Fill = false;
2889+ Gtk.ButtonBox.ButtonBoxChild w15 = ((Gtk.ButtonBox.ButtonBoxChild)(this.hbuttonbox1[this.composite_warning_info_btn]));
2890+ w15.Expand = false;
2891+ w15.Fill = false;
2892 this.composite_warning_widget.Add(this.hbuttonbox1);
2893- Gtk.Box.BoxChild w29 = ((Gtk.Box.BoxChild)(this.composite_warning_widget[this.hbuttonbox1]));
2894- w29.Position = 1;
2895- w29.Expand = false;
2896- w29.Fill = false;
2897+ Gtk.Box.BoxChild w16 = ((Gtk.Box.BoxChild)(this.composite_warning_widget[this.hbuttonbox1]));
2898+ w16.Position = 1;
2899+ w16.Expand = false;
2900+ w16.Fill = false;
2901 this.vbox2.Add(this.composite_warning_widget);
2902- Gtk.Box.BoxChild w30 = ((Gtk.Box.BoxChild)(this.vbox2[this.composite_warning_widget]));
2903- w30.PackType = ((Gtk.PackType)(1));
2904- w30.Position = 1;
2905+ Gtk.Box.BoxChild w17 = ((Gtk.Box.BoxChild)(this.vbox2[this.composite_warning_widget]));
2906+ w17.PackType = ((Gtk.PackType)(1));
2907+ w17.Position = 3;
2908+ w17.Expand = false;
2909+ w17.Fill = false;
2910 this.Add(this.vbox2);
2911 if ((this.Child != null)) {
2912 this.Child.ShowAll();
2913@@ -297,11 +218,7 @@
2914 this.composite_warning_widget.Hide();
2915 this.Show();
2916 this.theme_combo.Changed += new System.EventHandler(this.OnThemeComboChanged);
2917- this.background_colorbutton.ColorSet += new System.EventHandler(this.OnBackgroundColorbuttonColorSet);
2918- this.clear_background.Clicked += new System.EventHandler(this.OnClearBackgroundClicked);
2919 this.pin_check.Clicked += new System.EventHandler(this.OnPinCheckClicked);
2920- this.shadow_check.Clicked += new System.EventHandler(this.OnShadowCheckClicked);
2921- this.animation_check.Clicked += new System.EventHandler(this.OnAnimationCheckbuttonClicked);
2922 this.composite_warning_info_btn.Clicked += new System.EventHandler(this.OnCompositeWarningInfoBtnClicked);
2923 }
2924 }
2925
2926=== modified file 'Do/gtk-gui/gui.stetic'
2927--- Do/gtk-gui/gui.stetic 2009-03-06 07:14:21 +0000
2928+++ Do/gtk-gui/gui.stetic 2009-04-21 02:15:39 +0000
2929@@ -6,7 +6,10 @@
2930 </configuration>
2931 <import>
2932 <widget-library name="Mono.Addins.Gui, Version=0.3.0.0, Culture=neutral, PublicKeyToken=0738eb9f132ed756" />
2933+ <widget-library name="../../Do.Platform.Linux/bin/Debug/Do.Platform.Linux.dll" />
2934+ <widget-library name="../../Do.Interface.Linux/bin/Debug/Do.Interface.Linux.dll" />
2935 <widget-library name="../bin/Debug/Do.exe" internal="true" />
2936+ <widget-library name="../../Do.Interface.Linux.AnimationBase/bin/Debug/Do.Interface.Linux.AnimationBase.dll" />
2937 </import>
2938 <widget class="Gtk.Window" id="Do.UI.PreferencesWindow" design-size="450 470">
2939 <property name="MemberName" />
2940@@ -702,134 +705,36 @@
2941 <property name="MemberName" />
2942 <property name="Spacing">6</property>
2943 <child>
2944- <widget class="Gtk.Alignment" id="alignment1">
2945+ <widget class="Gtk.HBox" id="hbox4">
2946 <property name="MemberName" />
2947- <child>
2948- <widget class="Gtk.Table" id="table1">
2949- <property name="MemberName" />
2950- <property name="NRows">2</property>
2951- <property name="RowSpacing">6</property>
2952- <property name="ColumnSpacing">16</property>
2953- <child>
2954- <placeholder />
2955- </child>
2956- <child>
2957- <placeholder />
2958- </child>
2959- <child>
2960- <widget class="Gtk.HBox" id="hbox3">
2961- <property name="MemberName" />
2962- <property name="Spacing">6</property>
2963- <child>
2964- <widget class="Gtk.ColorButton" id="background_colorbutton">
2965- <property name="MemberName" />
2966- <property name="CanFocus">True</property>
2967- <property name="Events">ButtonMotionMask, ButtonPressMask, ButtonReleaseMask</property>
2968- <property name="UseAlpha">True</property>
2969- <property name="Alpha">65535</property>
2970- <signal name="ColorSet" handler="OnBackgroundColorbuttonColorSet" />
2971- </widget>
2972- <packing>
2973- <property name="Position">0</property>
2974- <property name="AutoSize">False</property>
2975- </packing>
2976- </child>
2977- <child>
2978- <widget class="Gtk.Button" id="clear_background">
2979- <property name="MemberName" />
2980- <property name="CanFocus">True</property>
2981- <property name="Type">TextAndIcon</property>
2982- <property name="Icon">stock:gtk-clear Menu</property>
2983- <property name="Label" translatable="yes">_Reset</property>
2984- <property name="UseUnderline">True</property>
2985- <property name="Relief">None</property>
2986- <signal name="Clicked" handler="OnClearBackgroundClicked" />
2987- </widget>
2988- <packing>
2989- <property name="Position">1</property>
2990- <property name="AutoSize">True</property>
2991- <property name="Expand">False</property>
2992- <property name="Fill">False</property>
2993- </packing>
2994- </child>
2995- </widget>
2996- <packing>
2997- <property name="TopAttach">1</property>
2998- <property name="BottomAttach">2</property>
2999- <property name="LeftAttach">1</property>
3000- <property name="RightAttach">2</property>
3001- <property name="AutoSize">True</property>
3002- <property name="XOptions">Fill</property>
3003- <property name="YOptions">Fill</property>
3004- <property name="XExpand">False</property>
3005- <property name="XFill">True</property>
3006- <property name="XShrink">False</property>
3007- <property name="YExpand">False</property>
3008- <property name="YFill">True</property>
3009- <property name="YShrink">False</property>
3010- </packing>
3011- </child>
3012- <child>
3013- <widget class="Gtk.Label" id="label8">
3014- <property name="MemberName" />
3015- <property name="Xalign">0</property>
3016- <property name="LabelProp" translatable="yes">Background Color:</property>
3017- </widget>
3018- <packing>
3019- <property name="TopAttach">1</property>
3020- <property name="BottomAttach">2</property>
3021- <property name="AutoSize">True</property>
3022- <property name="XOptions">Fill</property>
3023- <property name="YOptions">Fill</property>
3024- <property name="XExpand">False</property>
3025- <property name="XFill">True</property>
3026- <property name="XShrink">False</property>
3027- <property name="YExpand">False</property>
3028- <property name="YFill">True</property>
3029- <property name="YShrink">False</property>
3030- </packing>
3031- </child>
3032- <child>
3033- <widget class="Gtk.ComboBox" id="theme_combo">
3034- <property name="MemberName" />
3035- <property name="IsTextCombo">True</property>
3036- <property name="Items" translatable="yes" />
3037- <signal name="Changed" handler="OnThemeComboChanged" />
3038- </widget>
3039- <packing>
3040- <property name="LeftAttach">1</property>
3041- <property name="RightAttach">2</property>
3042- <property name="AutoSize">True</property>
3043- <property name="XOptions">Fill</property>
3044- <property name="YOptions">Fill</property>
3045- <property name="XExpand">False</property>
3046- <property name="XFill">True</property>
3047- <property name="XShrink">False</property>
3048- <property name="YExpand">False</property>
3049- <property name="YFill">True</property>
3050- <property name="YShrink">False</property>
3051- </packing>
3052- </child>
3053- <child>
3054- <widget class="Gtk.Label" id="theme_lbl">
3055- <property name="MemberName" />
3056- <property name="Xalign">0</property>
3057- <property name="LabelProp" translatable="yes">_Theme:</property>
3058- <property name="UseUnderline">True</property>
3059- </widget>
3060- <packing>
3061- <property name="AutoSize">True</property>
3062- <property name="XOptions">Fill</property>
3063- <property name="YOptions">Fill</property>
3064- <property name="XExpand">False</property>
3065- <property name="XFill">True</property>
3066- <property name="XShrink">False</property>
3067- <property name="YExpand">False</property>
3068- <property name="YFill">True</property>
3069- <property name="YShrink">False</property>
3070- </packing>
3071- </child>
3072- </widget>
3073+ <property name="Spacing">6</property>
3074+ <child>
3075+ <widget class="Gtk.Label" id="theme_lbl">
3076+ <property name="MemberName" />
3077+ <property name="Xalign">0</property>
3078+ <property name="LabelProp" translatable="yes">_Theme:</property>
3079+ <property name="UseUnderline">True</property>
3080+ </widget>
3081+ <packing>
3082+ <property name="Position">0</property>
3083+ <property name="AutoSize">True</property>
3084+ <property name="Expand">False</property>
3085+ <property name="Fill">False</property>
3086+ </packing>
3087+ </child>
3088+ <child>
3089+ <widget class="Gtk.ComboBox" id="theme_combo">
3090+ <property name="MemberName" />
3091+ <property name="IsTextCombo">True</property>
3092+ <property name="Items" translatable="yes" />
3093+ <signal name="Changed" handler="OnThemeComboChanged" />
3094+ </widget>
3095+ <packing>
3096+ <property name="Position">1</property>
3097+ <property name="AutoSize">True</property>
3098+ <property name="Expand">False</property>
3099+ <property name="Fill">False</property>
3100+ </packing>
3101 </child>
3102 </widget>
3103 <packing>
3104@@ -876,41 +781,6 @@
3105 <property name="Fill">False</property>
3106 </packing>
3107 </child>
3108- <child>
3109- <widget class="Gtk.CheckButton" id="shadow_check">
3110- <property name="MemberName" />
3111- <property name="CanFocus">True</property>
3112- <property name="Label" translatable="yes">Show window shadow</property>
3113- <property name="DrawIndicator">True</property>
3114- <property name="HasLabel">True</property>
3115- <property name="UseUnderline">True</property>
3116- <signal name="Clicked" handler="OnShadowCheckClicked" />
3117- </widget>
3118- <packing>
3119- <property name="Position">1</property>
3120- <property name="AutoSize">True</property>
3121- <property name="Expand">False</property>
3122- <property name="Fill">False</property>
3123- </packing>
3124- </child>
3125- <child>
3126- <widget class="Gtk.CheckButton" id="animation_check">
3127- <property name="MemberName" />
3128- <property name="CanFocus">True</property>
3129- <property name="Label" translatable="yes">Animate window</property>
3130- <property name="Active">True</property>
3131- <property name="DrawIndicator">True</property>
3132- <property name="HasLabel">True</property>
3133- <property name="UseUnderline">True</property>
3134- <signal name="Clicked" handler="OnAnimationCheckbuttonClicked" />
3135- </widget>
3136- <packing>
3137- <property name="Position">2</property>
3138- <property name="AutoSize">True</property>
3139- <property name="Expand">False</property>
3140- <property name="Fill">False</property>
3141- </packing>
3142- </child>
3143 </widget>
3144 <packing>
3145 <property name="Position">0</property>
3146@@ -942,6 +812,34 @@
3147 </packing>
3148 </child>
3149 <child>
3150+ <widget class="Gtk.Alignment" id="theme_configuration_container">
3151+ <property name="MemberName" />
3152+ <property name="LeftPadding">6</property>
3153+ <property name="RightPadding">6</property>
3154+ <property name="BottomPadding">3</property>
3155+ <child>
3156+ <placeholder />
3157+ </child>
3158+ </widget>
3159+ <packing>
3160+ <property name="PackType">End</property>
3161+ <property name="Position">1</property>
3162+ <property name="AutoSize">True</property>
3163+ </packing>
3164+ </child>
3165+ <child>
3166+ <widget class="Gtk.HSeparator" id="hseparator1">
3167+ <property name="MemberName" />
3168+ </widget>
3169+ <packing>
3170+ <property name="PackType">End</property>
3171+ <property name="Position">2</property>
3172+ <property name="AutoSize">True</property>
3173+ <property name="Expand">False</property>
3174+ <property name="Fill">False</property>
3175+ </packing>
3176+ </child>
3177+ <child>
3178 <widget class="Gtk.VBox" id="composite_warning_widget">
3179 <property name="MemberName" />
3180 <property name="Visible">False</property>
3181@@ -989,14 +887,13 @@
3182 <property name="Fill">False</property>
3183 </packing>
3184 </child>
3185- <child>
3186- <placeholder />
3187- </child>
3188 </widget>
3189 <packing>
3190 <property name="PackType">End</property>
3191- <property name="Position">1</property>
3192+ <property name="Position">3</property>
3193 <property name="AutoSize">True</property>
3194+ <property name="Expand">False</property>
3195+ <property name="Fill">False</property>
3196 </packing>
3197 </child>
3198 </widget>
3199
3200=== modified file 'Do/gtk-gui/objects.xml'
3201--- Do/gtk-gui/objects.xml 2009-04-18 03:12:46 +0000
3202+++ Do/gtk-gui/objects.xml 2009-04-19 06:40:08 +0000
3203@@ -1,2 +1,14 @@
3204 <objects attr-sync="on">
3205+ <object type="Do.UI.KeybindingsPreferencesWidget" palette-category="Do" allow-children="false" base-type="Gtk.Bin">
3206+ <itemgroups />
3207+ <signals />
3208+ </object>
3209+ <object type="Do.UI.ManagePluginsPreferencesWidget" palette-category="Do" allow-children="false" base-type="Gtk.Bin">
3210+ <itemgroups />
3211+ <signals />
3212+ </object>
3213+ <object type="Do.UI.GeneralPreferencesWidget" palette-category="Do" allow-children="false" base-type="Gtk.Bin">
3214+ <itemgroups />
3215+ <signals />
3216+ </object>
3217 </objects>
3218\ No newline at end of file
3219
3220=== modified file 'Do/src/Do.Core/Controller.cs'
3221--- Do/src/Do.Core/Controller.cs 2009-04-01 03:25:59 +0000
3222+++ Do/src/Do.Core/Controller.cs 2009-04-21 02:15:39 +0000
3223@@ -48,6 +48,12 @@
3224
3225 public event EventHandler Summoned;
3226
3227+ internal IDoWindow Window {
3228+ get {
3229+ return window;
3230+ }
3231+ }
3232+
3233 public Gtk.AboutDialog AboutDialog { get; private set; }
3234 public PreferencesWindow PreferencesWindow { get; private set; }
3235
3236@@ -977,6 +983,7 @@
3237 PreferencesWindow = new PreferencesWindow ();
3238 PreferencesWindow.Hidden += delegate {
3239 // Release the window.
3240+ PreferencesWindow.Dispose ();
3241 PreferencesWindow.Destroy ();
3242 PreferencesWindow = null;
3243 // Reload universe.
3244
3245=== modified file 'Do/src/Do.UI/ColorConfigurationWidget.cs'
3246--- Do/src/Do.UI/ColorConfigurationWidget.cs 2009-03-06 05:52:26 +0000
3247+++ Do/src/Do.UI/ColorConfigurationWidget.cs 2009-04-21 02:15:39 +0000
3248@@ -41,8 +41,6 @@
3249 set { themes = value; }
3250 }
3251
3252- bool setup = false;
3253-
3254 public ColorConfigurationWidget ()
3255 {
3256 Build ();
3257@@ -55,95 +53,23 @@
3258 Themes.Add (theme.Name);
3259 }
3260
3261- SetupButtons ();
3262 if (!Screen.IsComposited) {
3263 composite_warning_widget.Visible = true;
3264 theme_combo.Sensitive = false;
3265- animation_check.State = shadow_check.State = Gtk.StateType.Insensitive;
3266 }
3267
3268 // Setup theme combo
3269 theme_combo.Active = Math.Max (0, Themes.IndexOf (Do.Preferences.Theme));
3270 pin_check.Active = Do.Preferences.AlwaysShowResults;
3271- }
3272-
3273- protected override void OnDestroyed ()
3274- {
3275- base.OnDestroyed ();
3276- }
3277-
3278- private void DisableButtons ()
3279- {
3280- clear_background.Sensitive = false;
3281- background_colorbutton.Sensitive = false;
3282- shadow_check.Sensitive = false;
3283- }
3284-
3285- private void SetupButtons ()
3286- {
3287- setup = true;
3288- ushort alpha;
3289- background_colorbutton.Color = ReadColor (BezelDrawingArea.BgColor, out alpha);
3290- background_colorbutton.Alpha = alpha;
3291- clear_background.Sensitive = true;
3292- background_colorbutton.Sensitive = shadow_check.Sensitive = true;
3293- shadow_check.Active = BezelDrawingArea.DrawShadow;
3294- animation_check.Active = BezelDrawingArea.Animated;
3295- Gtk.Application.Invoke (delegate { setup = false; });
3296- }
3297-
3298- private Gdk.Color ReadColor (string colorString, out ushort alpha)
3299- {
3300- Gdk.Color prefsColor;
3301- byte r,g,b;
3302- uint converted;
3303-
3304- try {
3305- converted = uint.Parse (colorString, System.Globalization.NumberStyles.HexNumber);
3306-
3307- alpha = (ushort) ((converted & 255) << 8);
3308- b = (byte) ((converted >> 8) & 255);
3309- g = (byte) ((converted >> 16) & 255);
3310- r = (byte) ((converted >> 24) & 255);
3311- prefsColor = new Gdk.Color (r,g,b);
3312- } catch (Exception e) {
3313- prefsColor = new Gdk.Color (0,0,0);
3314- alpha = ushort.MaxValue;
3315- if (colorString.ToLower () != "default") {
3316- Log<ColorConfigurationWidget>.Error ("Error setting color: {0}", e.Message);
3317- Log<ColorConfigurationWidget>.Debug (e.StackTrace);
3318- }
3319- }
3320-
3321- return prefsColor;
3322- }
3323-
3324+
3325+ theme_configuration_container.ShowAll ();
3326+ }
3327
3328 public Gtk.Bin GetConfiguration ()
3329 {
3330 return this;
3331 }
3332
3333- protected virtual void OnBackgroundColorbuttonColorSet (object sender, System.EventArgs e)
3334- {
3335- if (setup) return;
3336- string hex_string = string.Format ("{0}{1:X}", background_colorbutton.Color.ColorToHexString (), (byte) (background_colorbutton.Alpha >> 8));
3337- BezelDrawingArea.BgColor = hex_string;
3338- }
3339-
3340- protected virtual void OnClearBackgroundClicked (object sender, System.EventArgs e)
3341- {
3342- BezelDrawingArea.ResetBackgroundStyle ();
3343- background_colorbutton.Color = new Gdk.Color (0, 0, 0);
3344- background_colorbutton.Alpha = ushort.MaxValue;
3345- }
3346-
3347- protected virtual void OnShadowCheckClicked (object sender, System.EventArgs e)
3348- {
3349- if (setup) return;
3350- BezelDrawingArea.DrawShadow = shadow_check.Active;
3351- }
3352-
3353 protected virtual void OnPinCheckClicked (object sender, System.EventArgs e)
3354 {
3355 Do.Preferences.AlwaysShowResults = pin_check.Active;
3356@@ -152,11 +78,20 @@
3357 protected virtual void OnThemeComboChanged (object sender, System.EventArgs e)
3358 {
3359 Do.Preferences.Theme = Themes[theme_combo.Active];
3360+ SetupConfigurationWidget ();
3361 }
3362-
3363- protected virtual void OnAnimationCheckbuttonClicked (object sender, System.EventArgs e)
3364+
3365+ void SetupConfigurationWidget ()
3366 {
3367- BezelDrawingArea.Animated = animation_check.Active;
3368+ if (theme_configuration_container.Child != null)
3369+ theme_configuration_container.Remove (theme_configuration_container.Child);
3370+
3371+ if (Do.Controller.Window is IConfigurable) {
3372+ IConfigurable window = Do.Controller.Window as IConfigurable;
3373+ Gtk.Bin bin = window.GetConfiguration ();
3374+ theme_configuration_container.Add (bin);
3375+ }
3376+ theme_configuration_container.ShowAll ();
3377 }
3378
3379 protected virtual void OnCompositeWarningInfoBtnClicked (object sender, System.EventArgs e)
3380@@ -174,6 +109,12 @@
3381 public string Icon {
3382 get { return ""; }
3383 }
3384-
3385+
3386+ public override void Dispose ()
3387+ {
3388+ if (theme_configuration_container.Child != null)
3389+ theme_configuration_container.Child.Dispose ();
3390+ base.Dispose ();
3391+ }
3392 }
3393 }
3394
3395=== modified file 'Do/src/Do.UI/PreferencesWindow.cs'
3396--- Do/src/Do.UI/PreferencesWindow.cs 2009-01-05 22:19:09 +0000
3397+++ Do/src/Do.UI/PreferencesWindow.cs 2009-04-21 02:15:39 +0000
3398@@ -48,6 +48,7 @@
3399 base (WindowType.Toplevel)
3400 {
3401 Build ();
3402+ IconName = "gnome-desktop-config";
3403
3404 btn_close.IsFocus = true;
3405
3406@@ -74,5 +75,12 @@
3407 {
3408 Services.Environment.OpenUrl (HelpUrl);
3409 }
3410+
3411+ public override void Dispose ()
3412+ {
3413+ foreach (Gtk.Widget w in notebook.Children)
3414+ w.Dispose ();
3415+ base.Dispose ();
3416+ }
3417 }
3418 }
3419
3420=== modified file 'Makefile.am'
3421--- Makefile.am 2009-03-20 20:43:06 +0000
3422+++ Makefile.am 2009-04-21 03:00:56 +0000
3423@@ -10,12 +10,13 @@
3424 Do.Platform \
3425 Do.Interface.Wink \
3426 Do.Interface.Linux \
3427+ Do.Platform.Linux \
3428+ Do.Interface.Linux.AnimationBase \
3429 Do.Interface.Linux.Classic \
3430 Do.Interface.Linux.Docky \
3431 Do.Interface.Linux.GlassFrame \
3432 Do.Interface.Linux.HUD \
3433 Do.Interface.Linux.Mini \
3434- Do.Platform.Linux \
3435 Do \
3436 po \
3437 libdo \
3438
3439=== modified file 'configure.ac'
3440--- configure.ac 2009-03-20 20:43:06 +0000
3441+++ configure.ac 2009-04-20 00:24:22 +0000
3442@@ -128,6 +128,7 @@
3443 Do/src/AssemblyInfo.cs
3444 Do.Interface.Linux/Makefile
3445 Do.Interface.Linux/src/AssemblyInfo.cs
3446+Do.Interface.Linux.AnimationBase/Makefile
3447 Do.Interface.Linux.Classic/Makefile
3448 Do.Interface.Linux.Docky/Makefile
3449 Do.Interface.Linux.GlassFrame/Makefile