Do

Merge lp://staging/~jassmith/do/docklets into lp://staging/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://staging/~jassmith/do/docklets
Merge into: lp://staging/do
Diff against target: None lines
To merge this branch: bzr merge lp://staging/~jassmith/do/docklets
Reviewer Review Type Date Requested Status
Alex Launi (community) Approve
Review via email: mp+5765@code.staging.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://staging/~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
=== added directory 'Do.Interface.Linux.AnimationBase'
=== added file 'Do.Interface.Linux.AnimationBase/AssemblyInfo.cs'
--- Do.Interface.Linux.AnimationBase/AssemblyInfo.cs 1970-01-01 00:00:00 +0000
+++ Do.Interface.Linux.AnimationBase/AssemblyInfo.cs 2009-04-19 22:40:55 +0000
@@ -0,0 +1,42 @@
1//
2// Copyright (C) 2009 GNOME Do
3//
4// This program is free software: you can redistribute it and/or modify
5// it under the terms of the GNU General Public License as published by
6// the Free Software Foundation, either version 3 of the License, or
7// (at your option) any later version.
8//
9// This program is distributed in the hope that it will be useful,
10// but WITHOUT ANY WARRANTY; without even the implied warranty of
11// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
12// GNU General Public License for more details.
13//
14// You should have received a copy of the GNU General Public License
15// along with this program. If not, see <http://www.gnu.org/licenses/>.
16//
17using System.Reflection;
18using System.Runtime.CompilerServices;
19
20// Information about this assembly is defined by the following attributes.
21// Change them to the values specific to your project.
22
23[assembly: AssemblyTitle("Do.Interface.Linux.AnimationBase")]
24[assembly: AssemblyDescription("")]
25[assembly: AssemblyConfiguration("")]
26[assembly: AssemblyCompany("")]
27[assembly: AssemblyProduct("")]
28[assembly: AssemblyCopyright("")]
29[assembly: AssemblyTrademark("")]
30[assembly: AssemblyCulture("")]
31
32// The assembly version has the format "{Major}.{Minor}.{Build}.{Revision}".
33// The form "{Major}.{Minor}.*" will automatically update the build and revision,
34// and "{Major}.{Minor}.{Build}.*" will update just the revision.
35
36[assembly: AssemblyVersion("1.0.*")]
37
38// The following attributes are used to specify the signing key for the assembly,
39// if desired. See the Mono documentation for more information about signing.
40
41[assembly: AssemblyDelaySign(false)]
42[assembly: AssemblyKeyFile("")]
043
=== added file 'Do.Interface.Linux.AnimationBase/Do.Interface.Linux.AnimationBase.mdp'
--- Do.Interface.Linux.AnimationBase/Do.Interface.Linux.AnimationBase.mdp 1970-01-01 00:00:00 +0000
+++ Do.Interface.Linux.AnimationBase/Do.Interface.Linux.AnimationBase.mdp 2009-04-20 04:00:45 +0000
@@ -0,0 +1,54 @@
1<Project name="Do.Interface.Linux.AnimationBase" fileversion="2.0" language="C#" targetFramework="3.5" ctype="DotNetProject">
2 <Configurations active="Debug">
3 <Configuration name="Debug" ctype="DotNetProjectConfiguration">
4 <Output directory="bin/Debug" assembly="Do.Interface.Linux.AnimationBase" />
5 <Build debugmode="True" target="Library" />
6 <Execution runwithwarnings="True" consolepause="False" runtime="MsNet" />
7 <CodeGeneration compiler="Mcs" warninglevel="4" optimize="False" unsafecodeallowed="False" generateoverflowchecks="False" definesymbols="DEBUG" generatexmldocumentation="False" ctype="CSharpCompilerParameters" />
8 </Configuration>
9 <Configuration name="Release" ctype="DotNetProjectConfiguration">
10 <Output directory="bin/Release" assembly="Do.Interface.Linux.AnimationBase" />
11 <Build debugmode="False" target="Library" />
12 <Execution runwithwarnings="True" consolepause="False" runtime="MsNet" />
13 <CodeGeneration compiler="Mcs" warninglevel="4" optimize="False" unsafecodeallowed="False" generateoverflowchecks="False" generatexmldocumentation="False" ctype="CSharpCompilerParameters" />
14 </Configuration>
15 </Configurations>
16 <Contents>
17 <File name="AssemblyInfo.cs" subtype="Code" buildaction="Compile" />
18 <File name="src" subtype="Directory" buildaction="Compile" />
19 <File name="Resources" subtype="Directory" buildaction="Compile" />
20 <File name="Resources/Do.Interface.Linux.AnimationBase.addin.xml" subtype="Code" buildaction="Nothing" />
21 <File name="src/Do.Interface" subtype="Directory" buildaction="Compile" />
22 <File name="src/Do.Interface/Do.Interface.AnimationBase" subtype="Directory" buildaction="Compile" />
23 <File name="src/Do.Interface/Do.Interface.AnimationBase/Bezel.cs" subtype="Code" buildaction="Compile" />
24 <File name="src/Do.Interface/Do.Interface.AnimationBase/BezelColors.cs" subtype="Code" buildaction="Compile" />
25 <File name="src/Do.Interface/Do.Interface.AnimationBase/BezelDefaults.cs" subtype="Code" buildaction="Compile" />
26 <File name="src/Do.Interface/Do.Interface.AnimationBase/BezelDrawingArea.cs" subtype="Code" buildaction="Compile" />
27 <File name="src/Do.Interface/Do.Interface.AnimationBase/BezelDrawingContext.cs" subtype="Code" buildaction="Compile" />
28 <File name="src/Do.Interface/Do.Interface.AnimationBase/BezelGlassRenderClasses.cs" subtype="Code" buildaction="Compile" />
29 <File name="src/Do.Interface/Do.Interface.AnimationBase/BezelGlassResults.cs" subtype="Code" buildaction="Compile" />
30 <File name="src/Do.Interface/Do.Interface.AnimationBase/BezelGlassWindow.cs" subtype="Code" buildaction="Compile" />
31 <File name="src/Do.Interface/Do.Interface.AnimationBase/BezelResultsDrawingArea.cs" subtype="Code" buildaction="Compile" />
32 <File name="src/Do.Interface/Do.Interface.AnimationBase/IRenderInterfaces.cs" subtype="Code" buildaction="Compile" />
33 <File name="src/Do.Interface/Do.Interface.AnimationBase/TextRenderer.cs" subtype="Code" buildaction="Compile" />
34 <File name="src/Do.Interface/IRenderTheme.cs" subtype="Code" buildaction="Compile" />
35 <File name="gtk-gui/gui.stetic" subtype="Code" buildaction="EmbedAsResource" />
36 <File name="gtk-gui/generated.cs" subtype="Code" buildaction="Compile" />
37 <File name="src/Do.Interface/Do.Interface.AnimationBase/AnimationBaseConfigurationWidget.cs" subtype="Code" buildaction="Compile" />
38 <File name="gtk-gui/Do.Interface.AnimationBase.AnimationBaseConfigurationWidget.cs" subtype="Code" buildaction="Compile" />
39 </Contents>
40 <References>
41 <ProjectReference type="Gac" localcopy="True" refto="System, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
42 <ProjectReference type="Project" localcopy="True" refto="Do.Interface.Linux" />
43 <ProjectReference type="Project" localcopy="True" refto="Do.Platform" />
44 <ProjectReference type="Project" localcopy="True" refto="Do.Platform.Linux" />
45 <ProjectReference type="Gac" localcopy="True" refto="System.Core, Version=3.5.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
46 <ProjectReference type="Gac" localcopy="True" refto="Mono.Cairo, Version=2.0.0.0, Culture=neutral, PublicKeyToken=0738eb9f132ed756" />
47 <ProjectReference type="Gac" localcopy="True" refto="glib-sharp, Version=2.12.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f" />
48 <ProjectReference type="Gac" localcopy="True" refto="gtk-sharp, Version=2.12.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f" />
49 <ProjectReference type="Gac" localcopy="True" refto="gdk-sharp, Version=2.12.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f" />
50 <ProjectReference type="Gac" localcopy="True" refto="Mono.Posix, Version=2.0.0.0, Culture=neutral, PublicKeyToken=0738eb9f132ed756" />
51 <ProjectReference type="Project" localcopy="True" refto="Do.Universe" />
52 <ProjectReference type="Gac" localcopy="True" refto="gconf-sharp, Version=2.12.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f" />
53 </References>
54</Project>
0\ No newline at end of file55\ No newline at end of file
156
=== added file 'Do.Interface.Linux.AnimationBase/Makefile.am'
--- Do.Interface.Linux.AnimationBase/Makefile.am 1970-01-01 00:00:00 +0000
+++ Do.Interface.Linux.AnimationBase/Makefile.am 2009-04-20 04:00:45 +0000
@@ -0,0 +1,43 @@
1# Simple component buildsystem
2include $(top_srcdir)/build.rules.mk
3
4ASSEMBLY = Do.Interface.Linux.AnimationBase
5TARGET = library
6PKG_CONFIG_FILES = do.interface.linux.animationbase.pc
7
8FILES = \
9 AssemblyInfo.cs \
10 src/Do.Interface/IRenderTheme.cs \
11 src/Do.Interface/Do.Interface.AnimationBase/AnimationBaseConfigurationWidget.cs \
12 src/Do.Interface/Do.Interface.AnimationBase/Bezel.cs \
13 src/Do.Interface/Do.Interface.AnimationBase/BezelColors.cs \
14 src/Do.Interface/Do.Interface.AnimationBase/BezelDefaults.cs \
15 src/Do.Interface/Do.Interface.AnimationBase/BezelDrawingArea.cs \
16 src/Do.Interface/Do.Interface.AnimationBase/BezelDrawingContext.cs \
17 src/Do.Interface/Do.Interface.AnimationBase/BezelGlassRenderClasses.cs \
18 src/Do.Interface/Do.Interface.AnimationBase/BezelGlassResults.cs \
19 src/Do.Interface/Do.Interface.AnimationBase/BezelGlassWindow.cs \
20 src/Do.Interface/Do.Interface.AnimationBase/BezelResultsDrawingArea.cs \
21 src/Do.Interface/Do.Interface.AnimationBase/IRenderInterfaces.cs \
22 src/Do.Interface/Do.Interface.AnimationBase/TextRenderer.cs \
23 gtk-gui/Do.Interface.AnimationBase.AnimationBaseConfigurationWidget.cs \
24 gtk-gui/generated.cs
25
26
27RESOURCES = \
28 gtk-gui/gui.stetic \
29 Resources/Do.Interface.Linux.AnimationBase.addin.xml
30
31REFERENCES = \
32 System \
33 System.Core \
34 Mono.Cairo \
35 Mono.Posix \
36 $(GCONF_SHARP_20_LIBS) \
37 $(GTK_SHARP_20_LIBS)
38
39PROJECT_REFERENCES = \
40 Do.Platform.Linux \
41 Do.Platform \
42 Do.Interface.Linux \
43 Do.Universe
044
=== added directory 'Do.Interface.Linux.AnimationBase/Resources'
=== added file 'Do.Interface.Linux.AnimationBase/Resources/Do.Interface.Linux.AnimationBase.addin.xml'
--- Do.Interface.Linux.AnimationBase/Resources/Do.Interface.Linux.AnimationBase.addin.xml 1970-01-01 00:00:00 +0000
+++ Do.Interface.Linux.AnimationBase/Resources/Do.Interface.Linux.AnimationBase.addin.xml 2009-04-20 04:00:45 +0000
@@ -0,0 +1,10 @@
1<Addin id="Interface.Linux.AnimationBase" namespace="Do" version="1.0">
2
3 <Runtime>
4 <Import assembly="Do.Interface.Linux.AnimationBase.dll" />
5 </Runtime>
6
7 <Dependencies>
8 <Addin id="Interface.Linux" version="1.0" />
9 </Dependencies>
10</Addin>
0\ No newline at end of file11\ No newline at end of file
112
=== added file 'Do.Interface.Linux.AnimationBase/do.interface.linux.animationbase.pc.in'
--- Do.Interface.Linux.AnimationBase/do.interface.linux.animationbase.pc.in 1970-01-01 00:00:00 +0000
+++ Do.Interface.Linux.AnimationBase/do.interface.linux.animationbase.pc.in 2009-04-20 00:12:53 +0000
@@ -0,0 +1,6 @@
1Name: Do.Interface.Linux.AnimationBase
2Description: GTK+ Interface module for Do Animations
3Version: @ABI_VERSION@
4
5Requires: do.interface.linux do.platform do.universe
6Libs: -r:@expanded_libdir@/@PACKAGE@/Do.Interface.Linux.AnimationBase.dll
07
=== added directory 'Do.Interface.Linux.AnimationBase/gtk-gui'
=== added file 'Do.Interface.Linux.AnimationBase/gtk-gui/Do.Interface.AnimationBase.AnimationBaseConfigurationWidget.cs'
--- Do.Interface.Linux.AnimationBase/gtk-gui/Do.Interface.AnimationBase.AnimationBaseConfigurationWidget.cs 1970-01-01 00:00:00 +0000
+++ Do.Interface.Linux.AnimationBase/gtk-gui/Do.Interface.AnimationBase.AnimationBaseConfigurationWidget.cs 2009-04-20 04:00:45 +0000
@@ -0,0 +1,133 @@
1// ------------------------------------------------------------------------------
2// <autogenerated>
3// This code was generated by a tool.
4//
5//
6// Changes to this file may cause incorrect behavior and will be lost if
7// the code is regenerated.
8// </autogenerated>
9// ------------------------------------------------------------------------------
10
11namespace Do.Interface.AnimationBase {
12
13
14 public partial class AnimationBaseConfigurationWidget {
15
16 private Gtk.VBox vbox4;
17
18 private Gtk.HBox hbox4;
19
20 private Gtk.Label label8;
21
22 private Gtk.ColorButton background_colorbutton;
23
24 private Gtk.Button clear_background;
25
26 private Gtk.CheckButton shadow_check;
27
28 private Gtk.CheckButton animation_check;
29
30 protected virtual void Build() {
31 Stetic.Gui.Initialize(this);
32 // Widget Do.Interface.AnimationBase.AnimationBaseConfigurationWidget
33 Stetic.BinContainer.Attach(this);
34 this.Name = "Do.Interface.AnimationBase.AnimationBaseConfigurationWidget";
35 // Container child Do.Interface.AnimationBase.AnimationBaseConfigurationWidget.Gtk.Container+ContainerChild
36 this.vbox4 = new Gtk.VBox();
37 this.vbox4.Name = "vbox4";
38 this.vbox4.Spacing = 6;
39 // Container child vbox4.Gtk.Box+BoxChild
40 this.hbox4 = new Gtk.HBox();
41 this.hbox4.Name = "hbox4";
42 this.hbox4.Spacing = 6;
43 // Container child hbox4.Gtk.Box+BoxChild
44 this.label8 = new Gtk.Label();
45 this.label8.Name = "label8";
46 this.label8.Xalign = 0F;
47 this.label8.LabelProp = Mono.Unix.Catalog.GetString("Background Color:");
48 this.hbox4.Add(this.label8);
49 Gtk.Box.BoxChild w1 = ((Gtk.Box.BoxChild)(this.hbox4[this.label8]));
50 w1.Position = 0;
51 w1.Expand = false;
52 w1.Fill = false;
53 // Container child hbox4.Gtk.Box+BoxChild
54 this.background_colorbutton = new Gtk.ColorButton();
55 this.background_colorbutton.CanFocus = true;
56 this.background_colorbutton.Events = ((Gdk.EventMask)(784));
57 this.background_colorbutton.Name = "background_colorbutton";
58 this.background_colorbutton.UseAlpha = true;
59 this.background_colorbutton.Alpha = 65535;
60 this.hbox4.Add(this.background_colorbutton);
61 Gtk.Box.BoxChild w2 = ((Gtk.Box.BoxChild)(this.hbox4[this.background_colorbutton]));
62 w2.Position = 1;
63 w2.Expand = false;
64 w2.Fill = false;
65 // Container child hbox4.Gtk.Box+BoxChild
66 this.clear_background = new Gtk.Button();
67 this.clear_background.CanFocus = true;
68 this.clear_background.Name = "clear_background";
69 this.clear_background.UseUnderline = true;
70 this.clear_background.Relief = ((Gtk.ReliefStyle)(2));
71 // Container child clear_background.Gtk.Container+ContainerChild
72 Gtk.Alignment w3 = new Gtk.Alignment(0.5F, 0.5F, 0F, 0F);
73 // Container child GtkAlignment.Gtk.Container+ContainerChild
74 Gtk.HBox w4 = new Gtk.HBox();
75 w4.Spacing = 2;
76 // Container child GtkHBox.Gtk.Container+ContainerChild
77 Gtk.Image w5 = new Gtk.Image();
78 w5.Pixbuf = Stetic.IconLoader.LoadIcon(this, "gtk-clear", Gtk.IconSize.Menu, 16);
79 w4.Add(w5);
80 // Container child GtkHBox.Gtk.Container+ContainerChild
81 Gtk.Label w7 = new Gtk.Label();
82 w7.LabelProp = Mono.Unix.Catalog.GetString("_Reset");
83 w7.UseUnderline = true;
84 w4.Add(w7);
85 w3.Add(w4);
86 this.clear_background.Add(w3);
87 this.hbox4.Add(this.clear_background);
88 Gtk.Box.BoxChild w11 = ((Gtk.Box.BoxChild)(this.hbox4[this.clear_background]));
89 w11.Position = 2;
90 w11.Expand = false;
91 w11.Fill = false;
92 this.vbox4.Add(this.hbox4);
93 Gtk.Box.BoxChild w12 = ((Gtk.Box.BoxChild)(this.vbox4[this.hbox4]));
94 w12.Position = 0;
95 w12.Expand = false;
96 w12.Fill = false;
97 // Container child vbox4.Gtk.Box+BoxChild
98 this.shadow_check = new Gtk.CheckButton();
99 this.shadow_check.CanFocus = true;
100 this.shadow_check.Name = "shadow_check";
101 this.shadow_check.Label = Mono.Unix.Catalog.GetString("Show window shadow");
102 this.shadow_check.DrawIndicator = true;
103 this.shadow_check.UseUnderline = true;
104 this.vbox4.Add(this.shadow_check);
105 Gtk.Box.BoxChild w13 = ((Gtk.Box.BoxChild)(this.vbox4[this.shadow_check]));
106 w13.Position = 1;
107 w13.Expand = false;
108 w13.Fill = false;
109 // Container child vbox4.Gtk.Box+BoxChild
110 this.animation_check = new Gtk.CheckButton();
111 this.animation_check.CanFocus = true;
112 this.animation_check.Name = "animation_check";
113 this.animation_check.Label = Mono.Unix.Catalog.GetString("Animate window");
114 this.animation_check.Active = true;
115 this.animation_check.DrawIndicator = true;
116 this.animation_check.UseUnderline = true;
117 this.vbox4.Add(this.animation_check);
118 Gtk.Box.BoxChild w14 = ((Gtk.Box.BoxChild)(this.vbox4[this.animation_check]));
119 w14.Position = 2;
120 w14.Expand = false;
121 w14.Fill = false;
122 this.Add(this.vbox4);
123 if ((this.Child != null)) {
124 this.Child.ShowAll();
125 }
126 this.Hide();
127 this.background_colorbutton.ColorSet += new System.EventHandler(this.OnBackgroundColorbuttonColorSet);
128 this.clear_background.Clicked += new System.EventHandler(this.OnClearBackgroundClicked);
129 this.shadow_check.Toggled += new System.EventHandler(this.OnShadowCheckToggled);
130 this.animation_check.Toggled += new System.EventHandler(this.OnAnimationCheckToggled);
131 }
132 }
133}
0134
=== added file 'Do.Interface.Linux.AnimationBase/gtk-gui/generated.cs'
--- Do.Interface.Linux.AnimationBase/gtk-gui/generated.cs 1970-01-01 00:00:00 +0000
+++ Do.Interface.Linux.AnimationBase/gtk-gui/generated.cs 2009-04-20 04:00:45 +0000
@@ -0,0 +1,115 @@
1// ------------------------------------------------------------------------------
2// <autogenerated>
3// This code was generated by a tool.
4//
5//
6// Changes to this file may cause incorrect behavior and will be lost if
7// the code is regenerated.
8// </autogenerated>
9// ------------------------------------------------------------------------------
10
11namespace Stetic {
12
13
14 internal class Gui {
15
16 private static bool initialized;
17
18 internal static void Initialize(Gtk.Widget iconRenderer) {
19 if ((Stetic.Gui.initialized == false)) {
20 Stetic.Gui.initialized = true;
21 }
22 }
23 }
24
25 internal class BinContainer {
26
27 private Gtk.Widget child;
28
29 private Gtk.UIManager uimanager;
30
31 public static BinContainer Attach(Gtk.Bin bin) {
32 BinContainer bc = new BinContainer();
33 bin.SizeRequested += new Gtk.SizeRequestedHandler(bc.OnSizeRequested);
34 bin.SizeAllocated += new Gtk.SizeAllocatedHandler(bc.OnSizeAllocated);
35 bin.Added += new Gtk.AddedHandler(bc.OnAdded);
36 return bc;
37 }
38
39 private void OnSizeRequested(object sender, Gtk.SizeRequestedArgs args) {
40 if ((this.child != null)) {
41 args.Requisition = this.child.SizeRequest();
42 }
43 }
44
45 private void OnSizeAllocated(object sender, Gtk.SizeAllocatedArgs args) {
46 if ((this.child != null)) {
47 this.child.Allocation = args.Allocation;
48 }
49 }
50
51 private void OnAdded(object sender, Gtk.AddedArgs args) {
52 this.child = args.Widget;
53 }
54
55 public void SetUiManager(Gtk.UIManager uim) {
56 this.uimanager = uim;
57 this.child.Realized += new System.EventHandler(this.OnRealized);
58 }
59
60 private void OnRealized(object sender, System.EventArgs args) {
61 if ((this.uimanager != null)) {
62 Gtk.Widget w;
63 w = this.child.Toplevel;
64 if (((w != null) && typeof(Gtk.Window).IsInstanceOfType(w))) {
65 ((Gtk.Window)(w)).AddAccelGroup(this.uimanager.AccelGroup);
66 this.uimanager = null;
67 }
68 }
69 }
70 }
71
72 internal class IconLoader {
73
74 public static Gdk.Pixbuf LoadIcon(Gtk.Widget widget, string name, Gtk.IconSize size, int sz) {
75 Gdk.Pixbuf res = widget.RenderIcon(name, size, null);
76 if ((res != null)) {
77 return res;
78 }
79 else {
80 try {
81 return Gtk.IconTheme.Default.LoadIcon(name, sz, 0);
82 }
83 catch (System.Exception ) {
84 if ((name != "gtk-missing-image")) {
85 return Stetic.IconLoader.LoadIcon(widget, "gtk-missing-image", size, sz);
86 }
87 else {
88 Gdk.Pixmap pmap = new Gdk.Pixmap(Gdk.Screen.Default.RootWindow, sz, sz);
89 Gdk.GC gc = new Gdk.GC(pmap);
90 gc.RgbFgColor = new Gdk.Color(255, 255, 255);
91 pmap.DrawRectangle(gc, true, 0, 0, sz, sz);
92 gc.RgbFgColor = new Gdk.Color(0, 0, 0);
93 pmap.DrawRectangle(gc, false, 0, 0, (sz - 1), (sz - 1));
94 gc.SetLineAttributes(3, Gdk.LineStyle.Solid, Gdk.CapStyle.Round, Gdk.JoinStyle.Round);
95 gc.RgbFgColor = new Gdk.Color(255, 0, 0);
96 pmap.DrawLine(gc, (sz / 4), (sz / 4), ((sz - 1) - (sz / 4)), ((sz - 1) - (sz / 4)));
97 pmap.DrawLine(gc, ((sz - 1) - (sz / 4)), (sz / 4), (sz / 4), ((sz - 1) - (sz / 4)));
98 return Gdk.Pixbuf.FromDrawable(pmap, pmap.Colormap, 0, 0, 0, 0, sz, sz);
99 }
100 }
101 }
102 }
103 }
104
105 internal class ActionGroups {
106
107 public static Gtk.ActionGroup GetActionGroup(System.Type type) {
108 return Stetic.ActionGroups.GetActionGroup(type.FullName);
109 }
110
111 public static Gtk.ActionGroup GetActionGroup(string name) {
112 return null;
113 }
114 }
115}
0116
=== added file 'Do.Interface.Linux.AnimationBase/gtk-gui/gui.stetic'
--- Do.Interface.Linux.AnimationBase/gtk-gui/gui.stetic 1970-01-01 00:00:00 +0000
+++ Do.Interface.Linux.AnimationBase/gtk-gui/gui.stetic 2009-04-20 04:00:45 +0000
@@ -0,0 +1,116 @@
1<?xml version="1.0" encoding="utf-8"?>
2<stetic-interface>
3 <configuration>
4 <images-root-path>..</images-root-path>
5 <target-gtk-version>2.12</target-gtk-version>
6 </configuration>
7 <import>
8 <widget-library name="../../Do.Interface.Linux/bin/Debug/Do.Interface.Linux.dll" />
9 <widget-library name="../../Do.Platform.Linux/bin/Debug/Do.Platform.Linux.dll" />
10 <widget-library name="../bin/Debug/Do.Interface.Linux.AnimationBase.dll" internal="true" />
11 </import>
12 <widget class="Gtk.Bin" id="Do.Interface.AnimationBase.AnimationBaseConfigurationWidget" design-size="300 87">
13 <property name="MemberName" />
14 <property name="Visible">False</property>
15 <child>
16 <widget class="Gtk.VBox" id="vbox4">
17 <property name="MemberName" />
18 <property name="Spacing">6</property>
19 <child>
20 <widget class="Gtk.HBox" id="hbox4">
21 <property name="MemberName" />
22 <property name="Spacing">6</property>
23 <child>
24 <widget class="Gtk.Label" id="label8">
25 <property name="MemberName" />
26 <property name="Xalign">0</property>
27 <property name="LabelProp" translatable="yes">Background Color:</property>
28 </widget>
29 <packing>
30 <property name="Position">0</property>
31 <property name="AutoSize">True</property>
32 <property name="Expand">False</property>
33 <property name="Fill">False</property>
34 </packing>
35 </child>
36 <child>
37 <widget class="Gtk.ColorButton" id="background_colorbutton">
38 <property name="MemberName" />
39 <property name="CanFocus">True</property>
40 <property name="Events">ButtonMotionMask, ButtonPressMask, ButtonReleaseMask</property>
41 <property name="UseAlpha">True</property>
42 <property name="Alpha">65535</property>
43 <signal name="ColorSet" handler="OnBackgroundColorbuttonColorSet" />
44 </widget>
45 <packing>
46 <property name="Position">1</property>
47 <property name="AutoSize">True</property>
48 <property name="Expand">False</property>
49 <property name="Fill">False</property>
50 </packing>
51 </child>
52 <child>
53 <widget class="Gtk.Button" id="clear_background">
54 <property name="MemberName" />
55 <property name="CanFocus">True</property>
56 <property name="Type">TextAndIcon</property>
57 <property name="Icon">stock:gtk-clear Menu</property>
58 <property name="Label" translatable="yes">_Reset</property>
59 <property name="UseUnderline">True</property>
60 <property name="Relief">None</property>
61 <signal name="Clicked" handler="OnClearBackgroundClicked" />
62 </widget>
63 <packing>
64 <property name="Position">2</property>
65 <property name="AutoSize">True</property>
66 <property name="Expand">False</property>
67 <property name="Fill">False</property>
68 </packing>
69 </child>
70 </widget>
71 <packing>
72 <property name="Position">0</property>
73 <property name="AutoSize">True</property>
74 <property name="Expand">False</property>
75 <property name="Fill">False</property>
76 </packing>
77 </child>
78 <child>
79 <widget class="Gtk.CheckButton" id="shadow_check">
80 <property name="MemberName" />
81 <property name="CanFocus">True</property>
82 <property name="Label" translatable="yes">Show window shadow</property>
83 <property name="DrawIndicator">True</property>
84 <property name="HasLabel">True</property>
85 <property name="UseUnderline">True</property>
86 <signal name="Toggled" handler="OnShadowCheckToggled" />
87 </widget>
88 <packing>
89 <property name="Position">1</property>
90 <property name="AutoSize">True</property>
91 <property name="Expand">False</property>
92 <property name="Fill">False</property>
93 </packing>
94 </child>
95 <child>
96 <widget class="Gtk.CheckButton" id="animation_check">
97 <property name="MemberName" />
98 <property name="CanFocus">True</property>
99 <property name="Label" translatable="yes">Animate window</property>
100 <property name="Active">True</property>
101 <property name="DrawIndicator">True</property>
102 <property name="HasLabel">True</property>
103 <property name="UseUnderline">True</property>
104 <signal name="Toggled" handler="OnAnimationCheckToggled" />
105 </widget>
106 <packing>
107 <property name="Position">2</property>
108 <property name="AutoSize">True</property>
109 <property name="Expand">False</property>
110 <property name="Fill">False</property>
111 </packing>
112 </child>
113 </widget>
114 </child>
115 </widget>
116</stetic-interface>
0\ No newline at end of file117\ No newline at end of file
1118
=== added directory 'Do.Interface.Linux.AnimationBase/src'
=== added directory 'Do.Interface.Linux.AnimationBase/src/Do.Interface'
=== added directory 'Do.Interface.Linux.AnimationBase/src/Do.Interface/Do.Interface.AnimationBase'
=== added file 'Do.Interface.Linux.AnimationBase/src/Do.Interface/Do.Interface.AnimationBase/AnimationBaseConfigurationWidget.cs'
--- Do.Interface.Linux.AnimationBase/src/Do.Interface/Do.Interface.AnimationBase/AnimationBaseConfigurationWidget.cs 1970-01-01 00:00:00 +0000
+++ Do.Interface.Linux.AnimationBase/src/Do.Interface/Do.Interface.AnimationBase/AnimationBaseConfigurationWidget.cs 2009-04-20 04:00:45 +0000
@@ -0,0 +1,83 @@
1//
2// Copyright (C) 2009 GNOME Do
3//
4// This program is free software: you can redistribute it and/or modify
5// it under the terms of the GNU General Public License as published by
6// the Free Software Foundation, either version 3 of the License, or
7// (at your option) any later version.
8//
9// This program is distributed in the hope that it will be useful,
10// but WITHOUT ANY WARRANTY; without even the implied warranty of
11// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
12// GNU General Public License for more details.
13//
14// You should have received a copy of the GNU General Public License
15// along with this program. If not, see <http://www.gnu.org/licenses/>.
16//
17
18using System;
19using System.Collections.Generic;
20using System.Linq;
21
22using Gdk;
23using Gtk;
24using Cairo;
25
26using Do.Interface.CairoUtils;
27
28namespace Do.Interface.AnimationBase
29{
30
31
32 [System.ComponentModel.ToolboxItem(true)]
33 public partial class AnimationBaseConfigurationWidget : Gtk.Bin
34 {
35 BezelDrawingArea drawing_area;
36 bool setup = false;
37
38 public AnimationBaseConfigurationWidget(BezelDrawingArea drawingArea)
39 {
40 this.Build();
41
42 drawing_area = drawingArea;
43 SetupButtons ();
44 }
45
46 void SetupButtons ()
47 {
48 setup = true;
49 background_colorbutton.Color = drawing_area.BackgroundColor.ConvertToGdk ();
50 background_colorbutton.Alpha = (ushort) (drawing_area.BackgroundColor.A * ushort.MaxValue);
51 shadow_check.Active = BezelDrawingArea.DrawShadow;
52 animation_check.Active = BezelDrawingArea.Animated;
53
54 Gtk.Application.Invoke (delegate { setup = false; });
55 }
56
57 protected virtual void OnShadowCheckToggled (object sender, System.EventArgs e)
58 {
59 if (setup) return;
60 BezelDrawingArea.DrawShadow = shadow_check.Active;
61 }
62
63 protected virtual void OnAnimationCheckToggled (object sender, System.EventArgs e)
64 {
65 if (setup) return;
66 BezelDrawingArea.Animated = animation_check.Active;
67 }
68
69 protected virtual void OnBackgroundColorbuttonColorSet (object sender, System.EventArgs e)
70 {
71 if (setup) return;
72 string hex_string = string.Format ("{0}{1:X}", background_colorbutton.Color.ColorToHexString (), (byte) (background_colorbutton.Alpha >> 8));
73 BezelDrawingArea.BgColor = hex_string;
74 }
75
76 protected virtual void OnClearBackgroundClicked (object sender, System.EventArgs e)
77 {
78 BezelDrawingArea.ResetBackgroundStyle ();
79 background_colorbutton.Color = drawing_area.BackgroundColor.ConvertToGdk ();
80 background_colorbutton.Alpha = (ushort) (drawing_area.BackgroundColor.A * ushort.MaxValue);
81 }
82 }
83}
084
=== 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'
--- Do.Interface.Linux/src/Do.Interface/Do.Interface.AnimationBase/Bezel.cs 2009-01-07 21:41:05 +0000
+++ Do.Interface.Linux.AnimationBase/src/Do.Interface/Do.Interface.AnimationBase/Bezel.cs 2009-04-20 04:00:45 +0000
@@ -26,13 +26,14 @@
2626
27using Do.Universe;27using Do.Universe;
28using Do.Platform;28using Do.Platform;
29using Do.Platform.Linux;
29using Do.Interface;30using Do.Interface;
3031
31namespace Do.Interface.AnimationBase32namespace Do.Interface.AnimationBase
32{33{
33 34
34 35
35 public abstract class AbstractAnimatedInterface : Gtk.Window, IDoWindow36 public abstract class AbstractAnimatedInterface : Gtk.Window, IDoWindow, IConfigurable
36 {37 {
37 BezelDrawingArea bezel_drawing_area;38 BezelDrawingArea bezel_drawing_area;
38 BezelGlassResults bezel_glass_results;39 BezelGlassResults bezel_glass_results;
@@ -219,6 +220,26 @@
219 }220 }
220 }221 }
221222
223 #region IConfigurable implementation
224 public Bin GetConfiguration ()
225 {
226 return new AnimationBaseConfigurationWidget (bezel_drawing_area);
227 }
228
229 public string Description {
230 get {
231 return "Animated Interface Configuration";
232 }
233 }
234
235 public new string Icon {
236 get {
237 return "preferences";
238 }
239 }
240 #endregion
241
242
222 public bool ResultsCanHide { get { return true; } }243 public bool ResultsCanHide { get { return true; } }
223 244
224 public new event DoEventKeyDelegate KeyPressEvent;245 public new event DoEventKeyDelegate KeyPressEvent;
225246
=== 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'
=== 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'
=== 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'
--- Do.Interface.Linux/src/Do.Interface/Do.Interface.AnimationBase/BezelDrawingArea.cs 2009-01-27 05:19:42 +0000
+++ Do.Interface.Linux.AnimationBase/src/Do.Interface/Do.Interface.AnimationBase/BezelDrawingArea.cs 2009-04-20 04:00:45 +0000
@@ -145,7 +145,6 @@
145 }145 }
146#endregion146#endregion
147 147
148#region LocalVariables
149 public const int TextHeight = 11;148 public const int TextHeight = 11;
150 149
151 HUDStyle style;150 HUDStyle style;
@@ -184,10 +183,7 @@
184 bool[] entry_mode = new bool[3];183 bool[] entry_mode = new bool[3];
185 184
186 GConf.Client gconfClient;185 GConf.Client gconfClient;
187#endregion
188 186
189#region Properties
190#region Box Format
191 public Cairo.Color BackgroundColor {187 public Cairo.Color BackgroundColor {
192 get {188 get {
193 Gdk.Color color = new Gdk.Color ();189 Gdk.Color color = new Gdk.Color ();
@@ -318,8 +314,7 @@
318 return (2 * WindowBorder - BorderWidth) + ((BoxWidth + BorderWidth) * 3) + 2 * ShadowRadius; 314 return (2 * WindowBorder - BorderWidth) + ((BoxWidth + BorderWidth) * 3) + 2 * ShadowRadius;
319 } 315 }
320 }316 }
321#endregion317
322#region Animation Properties
323 private bool AnimationNeeded {318 private bool AnimationNeeded {
324 get {319 get {
325 return ExpandNeeded || 320 return ExpandNeeded ||
@@ -366,8 +361,7 @@
366 return window_fade != 1;361 return window_fade != 1;
367 }362 }
368 }363 }
369#endregion364
370#region Contexts
371 private BezelDrawingContext Context {365 private BezelDrawingContext Context {
372 get {366 get {
373 if (context == null)367 if (context == null)
@@ -383,8 +377,7 @@
383 return old_context;377 return old_context;
384 }378 }
385 }379 }
386#endregion380
387#region Renderers
388 public IBezelTitleBarRenderElement TitleBarRenderer { 381 public IBezelTitleBarRenderElement TitleBarRenderer {
389 get { return titleBarRenderer; } 382 get { return titleBarRenderer; }
390 }383 }
@@ -404,8 +397,6 @@
404 public IBezelDefaults BezelDefaults { 397 public IBezelDefaults BezelDefaults {
405 get { return bezelDefaults; } 398 get { return bezelDefaults; }
406 }399 }
407#endregion
408#endregion
409 400
410 public event EventHandler GtkThemeChanged;401 public event EventHandler GtkThemeChanged;
411 402
412403
=== 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'
=== 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'
=== 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'
=== 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'
=== 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'
=== 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'
=== 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'
=== renamed file 'Do.Interface.Linux/src/Do.Interface/IRenderTheme.cs' => 'Do.Interface.Linux.AnimationBase/src/Do.Interface/IRenderTheme.cs'
=== modified file 'Do.Interface.Linux.Classic/Do.Interface.Linux.Classic.mdp'
--- Do.Interface.Linux.Classic/Do.Interface.Linux.Classic.mdp 2009-01-27 03:23:24 +0000
+++ Do.Interface.Linux.Classic/Do.Interface.Linux.Classic.mdp 2009-04-20 00:12:53 +0000
@@ -1,10 +1,10 @@
1<Project name="Do.Interface.Linux.Classic" fileversion="2.0" language="C#" clr-version="Net_2_0" targetFramework="2.0" ctype="DotNetProject">1<Project name="Do.Interface.Linux.Classic" fileversion="2.0" language="C#" clr-version="Net_2_0" targetFramework="3.5" ctype="DotNetProject">
2 <Configurations active="Debug">2 <Configurations active="Debug">
3 <Configuration name="Debug" ctype="DotNetProjectConfiguration">3 <Configuration name="Debug" ctype="DotNetProjectConfiguration">
4 <Output directory="bin/Debug" assembly="Do.Interface.Linux.Classic" />4 <Output directory="bin/Debug" assembly="Do.Interface.Linux.Classic" />
5 <Build debugmode="True" target="Library" />5 <Build debugmode="True" target="Library" />
6 <Execution runwithwarnings="True" consolepause="False" runtime="MsNet" clr-version="Net_2_0" />6 <Execution runwithwarnings="True" consolepause="False" runtime="MsNet" clr-version="Net_2_0" />
7 <CodeGeneration compiler="Mcs" warninglevel="4" optimize="False" unsafecodeallowed="False" generateoverflowchecks="False" definesymbols="DEBUG" generatexmldocumentation="False" ctype="CSharpCompilerParameters" />7 <CodeGeneration compiler="Mcs" warninglevel="4" optimize="True" unsafecodeallowed="False" generateoverflowchecks="True" definesymbols="DEBUG" generatexmldocumentation="False" ctype="CSharpCompilerParameters" />
8 </Configuration>8 </Configuration>
9 <Configuration name="Release" ctype="DotNetProjectConfiguration">9 <Configuration name="Release" ctype="DotNetProjectConfiguration">
10 <Output directory="bin/Release" assembly="Do.Interface.Linux.Classic" />10 <Output directory="bin/Release" assembly="Do.Interface.Linux.Classic" />
@@ -31,5 +31,6 @@
31 <ProjectReference type="Gac" localcopy="True" refto="Mono.Cairo, Version=2.0.0.0, Culture=neutral, PublicKeyToken=0738eb9f132ed756" />31 <ProjectReference type="Gac" localcopy="True" refto="Mono.Cairo, Version=2.0.0.0, Culture=neutral, PublicKeyToken=0738eb9f132ed756" />
32 <ProjectReference type="Gac" localcopy="True" refto="System.Core, Version=3.5.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />32 <ProjectReference type="Gac" localcopy="True" refto="System.Core, Version=3.5.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
33 <ProjectReference type="Gac" localcopy="True" refto="Mono.Posix, Version=2.0.0.0, Culture=neutral, PublicKeyToken=0738eb9f132ed756" />33 <ProjectReference type="Gac" localcopy="True" refto="Mono.Posix, Version=2.0.0.0, Culture=neutral, PublicKeyToken=0738eb9f132ed756" />
34 <ProjectReference type="Project" localcopy="True" refto="Do.Interface.Linux.AnimationBase" />
34 </References>35 </References>
35</Project>36</Project>
36\ No newline at end of file37\ No newline at end of file
3738
=== modified file 'Do.Interface.Linux.Classic/Makefile.am'
--- Do.Interface.Linux.Classic/Makefile.am 2008-12-15 22:25:09 +0000
+++ Do.Interface.Linux.Classic/Makefile.am 2009-04-20 00:15:20 +0000
@@ -21,4 +21,5 @@
2121
22PROJECT_REFERENCES = \22PROJECT_REFERENCES = \
23 Do.Interface.Linux \23 Do.Interface.Linux \
24 Do.Interface.Linux.AnimationBase \
24 Do.Platform25 Do.Platform
2526
=== modified file 'Do.Interface.Linux.Docky/Do.Interface.Linux.Docky.mdp'
--- Do.Interface.Linux.Docky/Do.Interface.Linux.Docky.mdp 2009-04-18 03:12:46 +0000
+++ Do.Interface.Linux.Docky/Do.Interface.Linux.Docky.mdp 2009-04-20 04:49:28 +0000
@@ -1,11 +1,11 @@
1<Project name="Do.Interface.Linux.Docky" fileversion="2.0" language="C#" DefaultNamespace="Docky" clr-version="Net_2_0" targetFramework="2.0" ctype="DotNetProject">1<Project name="Do.Interface.Linux.Docky" fileversion="2.0" language="C#" DefaultNamespace="Docky" clr-version="Net_2_0" targetFramework="3.5" ctype="DotNetProject">
2 <Configurations active="Debug">2 <Configurations active="Debug">
3 <Configuration name="Debug" ctype="DotNetProjectConfiguration">3 <Configuration name="Debug" ctype="DotNetProjectConfiguration">
4 <Output directory="bin/Debug" assembly="Do.Interface.Linux.Docky" />4 <Output directory="bin/Debug" assembly="Do.Interface.Linux.Docky" />
5 <Build debugmode="True" target="Library" />5 <Build debugmode="True" target="Library" />
6 <Execution runwithwarnings="True" consolepause="False" runtime="MsNet" clr-version="Net_2_0" />6 <Execution runwithwarnings="True" consolepause="False" runtime="MsNet" clr-version="Net_2_0" />
7 <EnvironmentVariables />7 <EnvironmentVariables />
8 <CodeGeneration compiler="Mcs" warninglevel="4" optimize="False" unsafecodeallowed="False" generateoverflowchecks="False" generatexmldocumentation="False" ctype="CSharpCompilerParameters" />8 <CodeGeneration compiler="Mcs" warninglevel="4" optimize="True" unsafecodeallowed="False" generateoverflowchecks="True" generatexmldocumentation="False" ctype="CSharpCompilerParameters" />
9 </Configuration>9 </Configuration>
10 <Configuration name="Release" ctype="DotNetProjectConfiguration">10 <Configuration name="Release" ctype="DotNetProjectConfiguration">
11 <Output directory="bin/Release" assembly="Do.Interface.Linux.Docky" />11 <Output directory="bin/Release" assembly="Do.Interface.Linux.Docky" />
@@ -86,6 +86,10 @@
86 <File name="src/Docky.Interface/Docky.Interface.Menus/AbstractMenuArgs.cs" subtype="Code" buildaction="Compile" />86 <File name="src/Docky.Interface/Docky.Interface.Menus/AbstractMenuArgs.cs" subtype="Code" buildaction="Compile" />
87 <File name="src/Docky.Interface/Docky.Interface.Menus/WidgetMenuArgs.cs" subtype="Code" buildaction="Compile" />87 <File name="src/Docky.Interface/Docky.Interface.Menus/WidgetMenuArgs.cs" subtype="Code" buildaction="Compile" />
88 <File name="src/Docky.Interface/TextRenderContext.cs" subtype="Code" buildaction="Compile" />88 <File name="src/Docky.Interface/TextRenderContext.cs" subtype="Code" buildaction="Compile" />
89 <File name="gtk-gui/gui.stetic" subtype="Code" buildaction="EmbedAsResource" />
90 <File name="gtk-gui/generated.cs" subtype="Code" buildaction="Compile" />
91 <File name="src/Docky.Interface/DockyConfigurationWidget.cs" subtype="Code" buildaction="Compile" />
92 <File name="gtk-gui/Docky.Interface.DockyConfigurationWidget.cs" subtype="Code" buildaction="Compile" />
89 </Contents>93 </Contents>
90 <References>94 <References>
91 <ProjectReference type="Gac" localcopy="True" refto="System, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />95 <ProjectReference type="Gac" localcopy="True" refto="System, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
@@ -100,8 +104,10 @@
100 <ProjectReference type="Project" localcopy="True" refto="Do.Platform" />104 <ProjectReference type="Project" localcopy="True" refto="Do.Platform" />
101 <ProjectReference type="Project" localcopy="True" refto="Do.Universe" />105 <ProjectReference type="Project" localcopy="True" refto="Do.Universe" />
102 <ProjectReference type="Gac" localcopy="True" refto="gnomedesktop-sharp, Version=2.20.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f" />106 <ProjectReference type="Gac" localcopy="True" refto="gnomedesktop-sharp, Version=2.20.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f" />
103 <ProjectReference type="Gac" localcopy="True" refto="gnome-vfs-sharp, Version=2.12.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f" />
104 <ProjectReference type="Gac" localcopy="True" refto="rsvg2-sharp, Version=2.18.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f" />107 <ProjectReference type="Gac" localcopy="True" refto="rsvg2-sharp, Version=2.18.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f" />
105 <ProjectReference type="Gac" localcopy="True" refto="Mono.Addins, Version=0.3.0.0, Culture=neutral, PublicKeyToken=0738eb9f132ed756" />108 <ProjectReference type="Gac" localcopy="True" refto="Mono.Addins, Version=0.3.0.0, Culture=neutral, PublicKeyToken=0738eb9f132ed756" />
109 <ProjectReference type="Project" localcopy="True" refto="Do.Interface.Wink" />
110 <ProjectReference type="Project" localcopy="True" refto="Do.Platform.Linux" />
111 <ProjectReference type="Project" localcopy="True" refto="Do.Interface.Linux.AnimationBase" />
106 </References>112 </References>
107</Project>113</Project>
108\ No newline at end of file114\ No newline at end of file
109115
=== modified file 'Do.Interface.Linux.Docky/Makefile.am'
--- Do.Interface.Linux.Docky/Makefile.am 2009-04-18 03:12:46 +0000
+++ Do.Interface.Linux.Docky/Makefile.am 2009-04-20 04:49:28 +0000
@@ -7,6 +7,8 @@
7PKG_CONFIG_FILES = do.interface.linux.docky.pc7PKG_CONFIG_FILES = do.interface.linux.docky.pc
88
9FILES = \9FILES = \
10 gtk-gui/Docky.Interface.DockyConfigurationWidget.cs \
11 gtk-gui/generated.cs \
10 AssemblyInfo.cs \12 AssemblyInfo.cs \
11 src/Docky.Core/DockServices.cs \13 src/Docky.Core/DockServices.cs \
12 src/Docky.Core/IDockletService.cs \14 src/Docky.Core/IDockletService.cs \
@@ -25,6 +27,7 @@
25 src/Docky.Interface/DockArea_Rendering.cs \27 src/Docky.Interface/DockArea_Rendering.cs \
26 src/Docky.Interface/DockArea_DragAndDrop.cs \28 src/Docky.Interface/DockArea_DragAndDrop.cs \
27 src/Docky.Interface/DockAnimationState.cs \29 src/Docky.Interface/DockAnimationState.cs \
30 src/Docky.Interface/DockyConfigurationWidget.cs \
28 src/Docky.Interface/DoInteropService.cs \31 src/Docky.Interface/DoInteropService.cs \
29 src/Docky.Interface/Docky.Interface.Items/AbstractDockItem.cs \32 src/Docky.Interface/Docky.Interface.Items/AbstractDockItem.cs \
30 src/Docky.Interface/Docky.Interface.Items/AbstractDockletItem.cs \33 src/Docky.Interface/Docky.Interface.Items/AbstractDockletItem.cs \
@@ -70,6 +73,7 @@
70 src/Docky.Utilities/GtkUtils.cs73 src/Docky.Utilities/GtkUtils.cs
7174
72RESOURCES = \75RESOURCES = \
76 gtk-gui/gui.stetic \
73 Resources/Do.Interface.Linux.Docky.addin.xml \77 Resources/Do.Interface.Linux.Docky.addin.xml \
74 Resources/close.svg \78 Resources/close.svg \
75 Resources/run.svg \79 Resources/run.svg \
@@ -91,4 +95,6 @@
91 Do.Interface.Linux \95 Do.Interface.Linux \
92 Do.Interface.Wink \96 Do.Interface.Wink \
93 Do.Platform \97 Do.Platform \
98 Do.Platform.Linux \
99 Do.Interface.Linux.AnimationBase \
94 Do.Universe100 Do.Universe
95101
=== added directory 'Do.Interface.Linux.Docky/gtk-gui'
=== added file 'Do.Interface.Linux.Docky/gtk-gui/Docky.Interface.DockyConfigurationWidget.cs'
--- Do.Interface.Linux.Docky/gtk-gui/Docky.Interface.DockyConfigurationWidget.cs 1970-01-01 00:00:00 +0000
+++ Do.Interface.Linux.Docky/gtk-gui/Docky.Interface.DockyConfigurationWidget.cs 2009-04-21 02:15:39 +0000
@@ -0,0 +1,251 @@
1// ------------------------------------------------------------------------------
2// <autogenerated>
3// This code was generated by a tool.
4//
5//
6// Changes to this file may cause incorrect behavior and will be lost if
7// the code is regenerated.
8// </autogenerated>
9// ------------------------------------------------------------------------------
10
11namespace Docky.Interface {
12
13
14 public partial class DockyConfigurationWidget {
15
16 private Gtk.VBox vbox2;
17
18 private Gtk.HBox hbox5;
19
20 private Gtk.Label orientation_label;
21
22 private Gtk.ComboBox orientation_combobox;
23
24 private Gtk.HBox hbox8;
25
26 private Gtk.CheckButton autohide_checkbutton;
27
28 private Gtk.CheckButton window_overlap_checkbutton;
29
30 private Gtk.HBox hbox9;
31
32 private Gtk.CheckButton zoom_checkbutton;
33
34 private Gtk.CheckButton advanced_indicators_checkbutton;
35
36 private Gtk.HBox hbox6;
37
38 private Gtk.Label zoom_size_label;
39
40 private Gtk.HScale zoom_scale;
41
42 private Gtk.HBox hbox7;
43
44 private Gtk.Label zoom_width_label;
45
46 private Gtk.HScale zoom_width_scale;
47
48 private Gtk.Label label5;
49
50 private Gtk.ScrolledWindow scrolled_window;
51
52 protected virtual void Build() {
53 Stetic.Gui.Initialize(this);
54 // Widget Docky.Interface.DockyConfigurationWidget
55 Stetic.BinContainer.Attach(this);
56 this.Name = "Docky.Interface.DockyConfigurationWidget";
57 // Container child Docky.Interface.DockyConfigurationWidget.Gtk.Container+ContainerChild
58 this.vbox2 = new Gtk.VBox();
59 this.vbox2.Name = "vbox2";
60 this.vbox2.Spacing = 6;
61 // Container child vbox2.Gtk.Box+BoxChild
62 this.hbox5 = new Gtk.HBox();
63 this.hbox5.Name = "hbox5";
64 this.hbox5.Spacing = 6;
65 // Container child hbox5.Gtk.Box+BoxChild
66 this.orientation_label = new Gtk.Label();
67 this.orientation_label.Name = "orientation_label";
68 this.orientation_label.LabelProp = Mono.Unix.Catalog.GetString("Orientation:");
69 this.hbox5.Add(this.orientation_label);
70 Gtk.Box.BoxChild w1 = ((Gtk.Box.BoxChild)(this.hbox5[this.orientation_label]));
71 w1.Position = 0;
72 w1.Expand = false;
73 w1.Fill = false;
74 // Container child hbox5.Gtk.Box+BoxChild
75 this.orientation_combobox = Gtk.ComboBox.NewText();
76 this.orientation_combobox.Name = "orientation_combobox";
77 this.hbox5.Add(this.orientation_combobox);
78 Gtk.Box.BoxChild w2 = ((Gtk.Box.BoxChild)(this.hbox5[this.orientation_combobox]));
79 w2.Position = 1;
80 w2.Expand = false;
81 w2.Fill = false;
82 this.vbox2.Add(this.hbox5);
83 Gtk.Box.BoxChild w3 = ((Gtk.Box.BoxChild)(this.vbox2[this.hbox5]));
84 w3.Position = 0;
85 w3.Expand = false;
86 w3.Fill = false;
87 // Container child vbox2.Gtk.Box+BoxChild
88 this.hbox8 = new Gtk.HBox();
89 this.hbox8.Name = "hbox8";
90 this.hbox8.Homogeneous = true;
91 this.hbox8.Spacing = 6;
92 // Container child hbox8.Gtk.Box+BoxChild
93 this.autohide_checkbutton = new Gtk.CheckButton();
94 this.autohide_checkbutton.CanFocus = true;
95 this.autohide_checkbutton.Name = "autohide_checkbutton";
96 this.autohide_checkbutton.Label = Mono.Unix.Catalog.GetString("Automatically Hide");
97 this.autohide_checkbutton.DrawIndicator = true;
98 this.autohide_checkbutton.UseUnderline = true;
99 this.hbox8.Add(this.autohide_checkbutton);
100 Gtk.Box.BoxChild w4 = ((Gtk.Box.BoxChild)(this.hbox8[this.autohide_checkbutton]));
101 w4.Position = 0;
102 // Container child hbox8.Gtk.Box+BoxChild
103 this.window_overlap_checkbutton = new Gtk.CheckButton();
104 this.window_overlap_checkbutton.CanFocus = true;
105 this.window_overlap_checkbutton.Name = "window_overlap_checkbutton";
106 this.window_overlap_checkbutton.Label = Mono.Unix.Catalog.GetString("Allow Window Overlap");
107 this.window_overlap_checkbutton.DrawIndicator = true;
108 this.window_overlap_checkbutton.UseUnderline = true;
109 this.hbox8.Add(this.window_overlap_checkbutton);
110 Gtk.Box.BoxChild w5 = ((Gtk.Box.BoxChild)(this.hbox8[this.window_overlap_checkbutton]));
111 w5.Position = 1;
112 this.vbox2.Add(this.hbox8);
113 Gtk.Box.BoxChild w6 = ((Gtk.Box.BoxChild)(this.vbox2[this.hbox8]));
114 w6.Position = 1;
115 w6.Expand = false;
116 w6.Fill = false;
117 // Container child vbox2.Gtk.Box+BoxChild
118 this.hbox9 = new Gtk.HBox();
119 this.hbox9.Name = "hbox9";
120 this.hbox9.Homogeneous = true;
121 this.hbox9.Spacing = 6;
122 // Container child hbox9.Gtk.Box+BoxChild
123 this.zoom_checkbutton = new Gtk.CheckButton();
124 this.zoom_checkbutton.CanFocus = true;
125 this.zoom_checkbutton.Name = "zoom_checkbutton";
126 this.zoom_checkbutton.Label = Mono.Unix.Catalog.GetString("Enable Zoom");
127 this.zoom_checkbutton.DrawIndicator = true;
128 this.zoom_checkbutton.UseUnderline = true;
129 this.hbox9.Add(this.zoom_checkbutton);
130 Gtk.Box.BoxChild w7 = ((Gtk.Box.BoxChild)(this.hbox9[this.zoom_checkbutton]));
131 w7.Position = 0;
132 // Container child hbox9.Gtk.Box+BoxChild
133 this.advanced_indicators_checkbutton = new Gtk.CheckButton();
134 this.advanced_indicators_checkbutton.CanFocus = true;
135 this.advanced_indicators_checkbutton.Name = "advanced_indicators_checkbutton";
136 this.advanced_indicators_checkbutton.Label = Mono.Unix.Catalog.GetString("Indicate Multiple Windows");
137 this.advanced_indicators_checkbutton.DrawIndicator = true;
138 this.advanced_indicators_checkbutton.UseUnderline = true;
139 this.hbox9.Add(this.advanced_indicators_checkbutton);
140 Gtk.Box.BoxChild w8 = ((Gtk.Box.BoxChild)(this.hbox9[this.advanced_indicators_checkbutton]));
141 w8.Position = 1;
142 this.vbox2.Add(this.hbox9);
143 Gtk.Box.BoxChild w9 = ((Gtk.Box.BoxChild)(this.vbox2[this.hbox9]));
144 w9.Position = 2;
145 w9.Expand = false;
146 w9.Fill = false;
147 // Container child vbox2.Gtk.Box+BoxChild
148 this.hbox6 = new Gtk.HBox();
149 this.hbox6.Name = "hbox6";
150 this.hbox6.Spacing = 6;
151 // Container child hbox6.Gtk.Box+BoxChild
152 this.zoom_size_label = new Gtk.Label();
153 this.zoom_size_label.Name = "zoom_size_label";
154 this.zoom_size_label.Yalign = 0.83F;
155 this.zoom_size_label.LabelProp = Mono.Unix.Catalog.GetString("Zoom Size");
156 this.hbox6.Add(this.zoom_size_label);
157 Gtk.Box.BoxChild w10 = ((Gtk.Box.BoxChild)(this.hbox6[this.zoom_size_label]));
158 w10.Position = 0;
159 w10.Expand = false;
160 w10.Fill = false;
161 // Container child hbox6.Gtk.Box+BoxChild
162 this.zoom_scale = new Gtk.HScale(null);
163 this.zoom_scale.CanFocus = true;
164 this.zoom_scale.Name = "zoom_scale";
165 this.zoom_scale.UpdatePolicy = ((Gtk.UpdateType)(1));
166 this.zoom_scale.Adjustment.Lower = 0.1;
167 this.zoom_scale.Adjustment.Upper = 4;
168 this.zoom_scale.Adjustment.PageIncrement = 0.1;
169 this.zoom_scale.Adjustment.PageSize = 0.1;
170 this.zoom_scale.Adjustment.StepIncrement = 0.1;
171 this.zoom_scale.Adjustment.Value = 0.7;
172 this.zoom_scale.DrawValue = true;
173 this.zoom_scale.Digits = 0;
174 this.zoom_scale.ValuePos = ((Gtk.PositionType)(2));
175 this.hbox6.Add(this.zoom_scale);
176 Gtk.Box.BoxChild w11 = ((Gtk.Box.BoxChild)(this.hbox6[this.zoom_scale]));
177 w11.Position = 1;
178 this.vbox2.Add(this.hbox6);
179 Gtk.Box.BoxChild w12 = ((Gtk.Box.BoxChild)(this.vbox2[this.hbox6]));
180 w12.Position = 3;
181 w12.Expand = false;
182 w12.Fill = false;
183 // Container child vbox2.Gtk.Box+BoxChild
184 this.hbox7 = new Gtk.HBox();
185 this.hbox7.Name = "hbox7";
186 this.hbox7.Spacing = 6;
187 // Container child hbox7.Gtk.Box+BoxChild
188 this.zoom_width_label = new Gtk.Label();
189 this.zoom_width_label.Name = "zoom_width_label";
190 this.zoom_width_label.Yalign = 0.83F;
191 this.zoom_width_label.LabelProp = Mono.Unix.Catalog.GetString("Zoom Width");
192 this.hbox7.Add(this.zoom_width_label);
193 Gtk.Box.BoxChild w13 = ((Gtk.Box.BoxChild)(this.hbox7[this.zoom_width_label]));
194 w13.Position = 0;
195 w13.Expand = false;
196 w13.Fill = false;
197 // Container child hbox7.Gtk.Box+BoxChild
198 this.zoom_width_scale = new Gtk.HScale(null);
199 this.zoom_width_scale.CanFocus = true;
200 this.zoom_width_scale.Name = "zoom_width_scale";
201 this.zoom_width_scale.UpdatePolicy = ((Gtk.UpdateType)(1));
202 this.zoom_width_scale.Adjustment.Upper = 100;
203 this.zoom_width_scale.Adjustment.PageIncrement = 10;
204 this.zoom_width_scale.Adjustment.PageSize = 10;
205 this.zoom_width_scale.Adjustment.StepIncrement = 10;
206 this.zoom_width_scale.Adjustment.Value = 81;
207 this.zoom_width_scale.DrawValue = true;
208 this.zoom_width_scale.Digits = 0;
209 this.zoom_width_scale.ValuePos = ((Gtk.PositionType)(2));
210 this.hbox7.Add(this.zoom_width_scale);
211 Gtk.Box.BoxChild w14 = ((Gtk.Box.BoxChild)(this.hbox7[this.zoom_width_scale]));
212 w14.Position = 1;
213 this.vbox2.Add(this.hbox7);
214 Gtk.Box.BoxChild w15 = ((Gtk.Box.BoxChild)(this.vbox2[this.hbox7]));
215 w15.Position = 4;
216 w15.Expand = false;
217 w15.Fill = false;
218 // Container child vbox2.Gtk.Box+BoxChild
219 this.label5 = new Gtk.Label();
220 this.label5.Name = "label5";
221 this.label5.Xalign = 0F;
222 this.label5.LabelProp = Mono.Unix.Catalog.GetString("Configure Docklets:");
223 this.vbox2.Add(this.label5);
224 Gtk.Box.BoxChild w16 = ((Gtk.Box.BoxChild)(this.vbox2[this.label5]));
225 w16.Position = 5;
226 w16.Expand = false;
227 w16.Fill = false;
228 // Container child vbox2.Gtk.Box+BoxChild
229 this.scrolled_window = new Gtk.ScrolledWindow();
230 this.scrolled_window.CanFocus = true;
231 this.scrolled_window.Name = "scrolled_window";
232 this.scrolled_window.ShadowType = ((Gtk.ShadowType)(1));
233 this.vbox2.Add(this.scrolled_window);
234 Gtk.Box.BoxChild w17 = ((Gtk.Box.BoxChild)(this.vbox2[this.scrolled_window]));
235 w17.Position = 6;
236 this.Add(this.vbox2);
237 if ((this.Child != null)) {
238 this.Child.ShowAll();
239 }
240 this.Hide();
241 this.orientation_combobox.Changed += new System.EventHandler(this.OnOrientationComboboxChanged);
242 this.autohide_checkbutton.Toggled += new System.EventHandler(this.OnAutohideCheckbuttonToggled);
243 this.window_overlap_checkbutton.Toggled += new System.EventHandler(this.OnWindowOverlapCheckbuttonToggled);
244 this.zoom_checkbutton.Toggled += new System.EventHandler(this.OnZoomCheckbuttonToggled);
245 this.advanced_indicators_checkbutton.Toggled += new System.EventHandler(this.OnAdvancedIndicatorsCheckbuttonToggled);
246 this.zoom_scale.FormatValue += new Gtk.FormatValueHandler(this.OnZoomScaleFormatValue);
247 this.zoom_scale.ValueChanged += new System.EventHandler(this.OnZoomScaleValueChanged);
248 this.zoom_width_scale.ValueChanged += new System.EventHandler(this.OnZoomWidthScaleValueChanged);
249 }
250 }
251}
0252
=== added file 'Do.Interface.Linux.Docky/gtk-gui/generated.cs'
--- Do.Interface.Linux.Docky/gtk-gui/generated.cs 1970-01-01 00:00:00 +0000
+++ Do.Interface.Linux.Docky/gtk-gui/generated.cs 2009-04-19 22:16:43 +0000
@@ -0,0 +1,82 @@
1// ------------------------------------------------------------------------------
2// <autogenerated>
3// This code was generated by a tool.
4//
5//
6// Changes to this file may cause incorrect behavior and will be lost if
7// the code is regenerated.
8// </autogenerated>
9// ------------------------------------------------------------------------------
10
11namespace Stetic {
12
13
14 internal class Gui {
15
16 private static bool initialized;
17
18 internal static void Initialize(Gtk.Widget iconRenderer) {
19 if ((Stetic.Gui.initialized == false)) {
20 Stetic.Gui.initialized = true;
21 }
22 }
23 }
24
25 internal class BinContainer {
26
27 private Gtk.Widget child;
28
29 private Gtk.UIManager uimanager;
30
31 public static BinContainer Attach(Gtk.Bin bin) {
32 BinContainer bc = new BinContainer();
33 bin.SizeRequested += new Gtk.SizeRequestedHandler(bc.OnSizeRequested);
34 bin.SizeAllocated += new Gtk.SizeAllocatedHandler(bc.OnSizeAllocated);
35 bin.Added += new Gtk.AddedHandler(bc.OnAdded);
36 return bc;
37 }
38
39 private void OnSizeRequested(object sender, Gtk.SizeRequestedArgs args) {
40 if ((this.child != null)) {
41 args.Requisition = this.child.SizeRequest();
42 }
43 }
44
45 private void OnSizeAllocated(object sender, Gtk.SizeAllocatedArgs args) {
46 if ((this.child != null)) {
47 this.child.Allocation = args.Allocation;
48 }
49 }
50
51 private void OnAdded(object sender, Gtk.AddedArgs args) {
52 this.child = args.Widget;
53 }
54
55 public void SetUiManager(Gtk.UIManager uim) {
56 this.uimanager = uim;
57 this.child.Realized += new System.EventHandler(this.OnRealized);
58 }
59
60 private void OnRealized(object sender, System.EventArgs args) {
61 if ((this.uimanager != null)) {
62 Gtk.Widget w;
63 w = this.child.Toplevel;
64 if (((w != null) && typeof(Gtk.Window).IsInstanceOfType(w))) {
65 ((Gtk.Window)(w)).AddAccelGroup(this.uimanager.AccelGroup);
66 this.uimanager = null;
67 }
68 }
69 }
70 }
71
72 internal class ActionGroups {
73
74 public static Gtk.ActionGroup GetActionGroup(System.Type type) {
75 return Stetic.ActionGroups.GetActionGroup(type.FullName);
76 }
77
78 public static Gtk.ActionGroup GetActionGroup(string name) {
79 return null;
80 }
81 }
82}
083
=== added file 'Do.Interface.Linux.Docky/gtk-gui/gui.stetic'
--- Do.Interface.Linux.Docky/gtk-gui/gui.stetic 1970-01-01 00:00:00 +0000
+++ Do.Interface.Linux.Docky/gtk-gui/gui.stetic 2009-04-21 02:15:39 +0000
@@ -0,0 +1,275 @@
1<?xml version="1.0" encoding="utf-8"?>
2<stetic-interface>
3 <configuration>
4 <images-root-path>..</images-root-path>
5 <target-gtk-version>2.12</target-gtk-version>
6 </configuration>
7 <import>
8 <widget-library name="wnck-sharp, Version=2.20.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f" />
9 <widget-library name="../../Do.Interface.Linux/bin/Debug/Do.Interface.Linux.dll" />
10 <widget-library name="gnomedesktop-sharp, Version=2.20.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f" />
11 <widget-library name="../../Do.Interface.Wink/bin/Debug/Do.Interface.Wnck.dll" />
12 <widget-library name="../bin/Debug/Do.Interface.Linux.Docky.dll" internal="true" />
13 <widget-library name="../../Do.Platform.Linux/bin/Debug/Do.Platform.Linux.dll" />
14 <widget-library name="../../Do.Interface.Linux.AnimationBase/bin/Debug/Do.Interface.Linux.AnimationBase.dll" />
15 </import>
16 <widget class="Gtk.Bin" id="Docky.Interface.DockyConfigurationWidget" design-size="376 347">
17 <property name="MemberName" />
18 <property name="Visible">False</property>
19 <child>
20 <widget class="Gtk.VBox" id="vbox2">
21 <property name="MemberName" />
22 <property name="Spacing">6</property>
23 <child>
24 <widget class="Gtk.HBox" id="hbox5">
25 <property name="MemberName" />
26 <property name="Spacing">6</property>
27 <child>
28 <widget class="Gtk.Label" id="orientation_label">
29 <property name="MemberName" />
30 <property name="LabelProp" translatable="yes">Orientation:</property>
31 </widget>
32 <packing>
33 <property name="Position">0</property>
34 <property name="AutoSize">True</property>
35 <property name="Expand">False</property>
36 <property name="Fill">False</property>
37 </packing>
38 </child>
39 <child>
40 <widget class="Gtk.ComboBox" id="orientation_combobox">
41 <property name="MemberName" />
42 <property name="IsTextCombo">True</property>
43 <property name="Items" translatable="yes" />
44 <signal name="Changed" handler="OnOrientationComboboxChanged" />
45 </widget>
46 <packing>
47 <property name="Position">1</property>
48 <property name="AutoSize">True</property>
49 <property name="Expand">False</property>
50 <property name="Fill">False</property>
51 </packing>
52 </child>
53 </widget>
54 <packing>
55 <property name="Position">0</property>
56 <property name="AutoSize">True</property>
57 <property name="Expand">False</property>
58 <property name="Fill">False</property>
59 </packing>
60 </child>
61 <child>
62 <widget class="Gtk.HBox" id="hbox8">
63 <property name="MemberName" />
64 <property name="Homogeneous">True</property>
65 <property name="Spacing">6</property>
66 <child>
67 <widget class="Gtk.CheckButton" id="autohide_checkbutton">
68 <property name="MemberName" />
69 <property name="CanFocus">True</property>
70 <property name="Label" translatable="yes">Automatically Hide</property>
71 <property name="DrawIndicator">True</property>
72 <property name="HasLabel">True</property>
73 <property name="UseUnderline">True</property>
74 <signal name="Toggled" handler="OnAutohideCheckbuttonToggled" />
75 </widget>
76 <packing>
77 <property name="Position">0</property>
78 <property name="AutoSize">True</property>
79 </packing>
80 </child>
81 <child>
82 <widget class="Gtk.CheckButton" id="window_overlap_checkbutton">
83 <property name="MemberName" />
84 <property name="CanFocus">True</property>
85 <property name="Label" translatable="yes">Allow Window Overlap</property>
86 <property name="DrawIndicator">True</property>
87 <property name="HasLabel">True</property>
88 <property name="UseUnderline">True</property>
89 <signal name="Toggled" handler="OnWindowOverlapCheckbuttonToggled" />
90 </widget>
91 <packing>
92 <property name="Position">1</property>
93 <property name="AutoSize">True</property>
94 </packing>
95 </child>
96 </widget>
97 <packing>
98 <property name="Position">1</property>
99 <property name="AutoSize">True</property>
100 <property name="Expand">False</property>
101 <property name="Fill">False</property>
102 </packing>
103 </child>
104 <child>
105 <widget class="Gtk.HBox" id="hbox9">
106 <property name="MemberName" />
107 <property name="Homogeneous">True</property>
108 <property name="Spacing">6</property>
109 <child>
110 <widget class="Gtk.CheckButton" id="zoom_checkbutton">
111 <property name="MemberName" />
112 <property name="CanFocus">True</property>
113 <property name="Label" translatable="yes">Enable Zoom</property>
114 <property name="DrawIndicator">True</property>
115 <property name="HasLabel">True</property>
116 <property name="UseUnderline">True</property>
117 <signal name="Toggled" handler="OnZoomCheckbuttonToggled" />
118 </widget>
119 <packing>
120 <property name="Position">0</property>
121 <property name="AutoSize">True</property>
122 </packing>
123 </child>
124 <child>
125 <widget class="Gtk.CheckButton" id="advanced_indicators_checkbutton">
126 <property name="MemberName" />
127 <property name="CanFocus">True</property>
128 <property name="Label" translatable="yes">Indicate Multiple Windows</property>
129 <property name="DrawIndicator">True</property>
130 <property name="HasLabel">True</property>
131 <property name="UseUnderline">True</property>
132 <signal name="Toggled" handler="OnAdvancedIndicatorsCheckbuttonToggled" />
133 </widget>
134 <packing>
135 <property name="Position">1</property>
136 <property name="AutoSize">True</property>
137 </packing>
138 </child>
139 </widget>
140 <packing>
141 <property name="Position">2</property>
142 <property name="AutoSize">True</property>
143 <property name="Expand">False</property>
144 <property name="Fill">False</property>
145 </packing>
146 </child>
147 <child>
148 <widget class="Gtk.HBox" id="hbox6">
149 <property name="MemberName" />
150 <property name="Spacing">6</property>
151 <child>
152 <widget class="Gtk.Label" id="zoom_size_label">
153 <property name="MemberName" />
154 <property name="Yalign">0.83</property>
155 <property name="LabelProp" translatable="yes">Zoom Size</property>
156 </widget>
157 <packing>
158 <property name="Position">0</property>
159 <property name="AutoSize">True</property>
160 <property name="Expand">False</property>
161 <property name="Fill">False</property>
162 </packing>
163 </child>
164 <child>
165 <widget class="Gtk.HScale" id="zoom_scale">
166 <property name="MemberName" />
167 <property name="CanFocus">True</property>
168 <property name="UpdatePolicy">Discontinuous</property>
169 <property name="Lower">0.1</property>
170 <property name="Upper">4</property>
171 <property name="PageIncrement">0.1</property>
172 <property name="PageSize">0.1</property>
173 <property name="StepIncrement">0.1</property>
174 <property name="Value">0.7</property>
175 <property name="DrawValue">True</property>
176 <property name="Digits">0</property>
177 <property name="ValuePos">Top</property>
178 <signal name="FormatValue" handler="OnZoomScaleFormatValue" />
179 <signal name="ValueChanged" handler="OnZoomScaleValueChanged" />
180 </widget>
181 <packing>
182 <property name="Position">1</property>
183 <property name="AutoSize">True</property>
184 </packing>
185 </child>
186 </widget>
187 <packing>
188 <property name="Position">3</property>
189 <property name="AutoSize">True</property>
190 <property name="Expand">False</property>
191 <property name="Fill">False</property>
192 </packing>
193 </child>
194 <child>
195 <widget class="Gtk.HBox" id="hbox7">
196 <property name="MemberName" />
197 <property name="Spacing">6</property>
198 <child>
199 <widget class="Gtk.Label" id="zoom_width_label">
200 <property name="MemberName" />
201 <property name="Yalign">0.83</property>
202 <property name="LabelProp" translatable="yes">Zoom Width</property>
203 </widget>
204 <packing>
205 <property name="Position">0</property>
206 <property name="AutoSize">True</property>
207 <property name="Expand">False</property>
208 <property name="Fill">False</property>
209 </packing>
210 </child>
211 <child>
212 <widget class="Gtk.HScale" id="zoom_width_scale">
213 <property name="MemberName" />
214 <property name="CanFocus">True</property>
215 <property name="UpdatePolicy">Discontinuous</property>
216 <property name="Upper">100</property>
217 <property name="PageIncrement">10</property>
218 <property name="PageSize">10</property>
219 <property name="StepIncrement">10</property>
220 <property name="Value">81</property>
221 <property name="DrawValue">True</property>
222 <property name="Digits">0</property>
223 <property name="ValuePos">Top</property>
224 <signal name="ValueChanged" handler="OnZoomWidthScaleValueChanged" />
225 </widget>
226 <packing>
227 <property name="Position">1</property>
228 <property name="AutoSize">True</property>
229 </packing>
230 </child>
231 </widget>
232 <packing>
233 <property name="Position">4</property>
234 <property name="AutoSize">True</property>
235 <property name="Expand">False</property>
236 <property name="Fill">False</property>
237 </packing>
238 </child>
239 <child>
240 <widget class="Gtk.Label" id="label5">
241 <property name="MemberName" />
242 <property name="Xalign">0</property>
243 <property name="LabelProp" translatable="yes">Configure Docklets:</property>
244 </widget>
245 <packing>
246 <property name="Position">5</property>
247 <property name="AutoSize">True</property>
248 <property name="Expand">False</property>
249 <property name="Fill">False</property>
250 </packing>
251 </child>
252 <child>
253 <widget class="Gtk.ScrolledWindow" id="scrolled_window">
254 <property name="MemberName" />
255 <property name="CanFocus">True</property>
256 <property name="ShadowType">In</property>
257 <child>
258 <widget class="Gtk.Viewport" id="GtkViewport">
259 <property name="MemberName" />
260 <property name="ShadowType">None</property>
261 <child>
262 <placeholder />
263 </child>
264 </widget>
265 </child>
266 </widget>
267 <packing>
268 <property name="Position">6</property>
269 <property name="AutoSize">True</property>
270 </packing>
271 </child>
272 </widget>
273 </child>
274 </widget>
275</stetic-interface>
0\ No newline at end of file276\ No newline at end of file
1277
=== modified file 'Do.Interface.Linux.Docky/src/Docky.Interface/DockArea.cs'
--- Do.Interface.Linux.Docky/src/Docky.Interface/DockArea.cs 2009-04-18 03:12:46 +0000
+++ Do.Interface.Linux.Docky/src/Docky.Interface/DockArea.cs 2009-04-21 04:12:30 +0000
@@ -257,6 +257,7 @@
257 257
258 DockPreferences.MonitorChanged += HandleMonitorChanged; 258 DockPreferences.MonitorChanged += HandleMonitorChanged;
259 DockPreferences.IconSizeChanged += HandleIconSizeChanged; 259 DockPreferences.IconSizeChanged += HandleIconSizeChanged;
260 DockPreferences.OrientationChanged += HandleOrientationChanged;
260 261
261 DockServices.PainterService.PainterShowRequest += HandlePainterShowRequest;262 DockServices.PainterService.PainterShowRequest += HandlePainterShowRequest;
262 DockServices.PainterService.PainterHideRequest += HandlePainterHideRequest;263 DockServices.PainterService.PainterHideRequest += HandlePainterHideRequest;
@@ -284,6 +285,7 @@
284 285
285 DockPreferences.MonitorChanged -= HandleMonitorChanged;286 DockPreferences.MonitorChanged -= HandleMonitorChanged;
286 DockPreferences.IconSizeChanged -= HandleIconSizeChanged; 287 DockPreferences.IconSizeChanged -= HandleIconSizeChanged;
288 DockPreferences.OrientationChanged -= HandleOrientationChanged;
287 289
288 DockServices.PainterService.PainterShowRequest -= HandlePainterShowRequest;290 DockServices.PainterService.PainterShowRequest -= HandlePainterShowRequest;
289 DockServices.PainterService.PainterHideRequest -= HandlePainterHideRequest;291 DockServices.PainterService.PainterHideRequest -= HandlePainterHideRequest;
@@ -336,6 +338,12 @@
336 {338 {
337 Reconfigure ();339 Reconfigure ();
338 }340 }
341
342 void HandleOrientationChanged()
343 {
344 Reconfigure ();
345 window.Reposition ();
346 }
339 347
340 void HandleSizeChanged(object sender, EventArgs e)348 void HandleSizeChanged(object sender, EventArgs e)
341 {349 {
@@ -366,6 +374,7 @@
366 374
367 void HandleIconSizeChanged()375 void HandleIconSizeChanged()
368 {376 {
377 Reconfigure ();
369 AnimatedDraw ();378 AnimatedDraw ();
370 }379 }
371380
@@ -647,6 +656,16 @@
647 656
648 //send off the clicks657 //send off the clicks
649 Gdk.Point relative_point = Gdk.Point.Zero;658 Gdk.Point relative_point = Gdk.Point.Zero;
659 double zoom;
660 PointD center;
661 IconZoomedPosition (item, out center, out zoom);
662
663 int xOffset = (int) (Cursor.X - center.X);
664 int yOffset = (int) (Cursor.Y - center.Y);
665
666 relative_point.X = (int) (xOffset / zoom);
667 relative_point.Y = (int) (yOffset / zoom);
668
650 DockItems [item].Clicked (evnt.Button, evnt.State, relative_point);669 DockItems [item].Clicked (evnt.Button, evnt.State, relative_point);
651 670
652 AnimatedDraw ();671 AnimatedDraw ();
653672
=== modified file 'Do.Interface.Linux.Docky/src/Docky.Interface/DockWindow.cs'
--- Do.Interface.Linux.Docky/src/Docky.Interface/DockWindow.cs 2009-04-18 03:12:46 +0000
+++ Do.Interface.Linux.Docky/src/Docky.Interface/DockWindow.cs 2009-04-20 13:24:35 +0000
@@ -28,6 +28,7 @@
2828
29using Do.Universe;29using Do.Universe;
30using Do.Platform;30using Do.Platform;
31using Do.Platform.Linux;
31using Do.Interface;32using Do.Interface;
32using Do.Interface.Xlib;33using Do.Interface.Xlib;
33using Do.Interface.CairoUtils;34using Do.Interface.CairoUtils;
@@ -37,7 +38,7 @@
37{38{
38 39
39 40
40 public class DockWindow : Gtk.Window, IDoWindow41 public class DockWindow : Gtk.Window, IDoWindow, IConfigurable
41 {42 {
42 public static Gtk.Window Window { get; private set; }43 public static Gtk.Window Window { get; private set; }
43 44
@@ -229,7 +230,7 @@
229 Reposition ();230 Reposition ();
230 }231 }
231 232
232 void Reposition ()233 public void Reposition ()
233 {234 {
234 Gdk.Rectangle geo, main, res;235 Gdk.Rectangle geo, main, res;
235 236
@@ -449,6 +450,26 @@
449 base.Dispose ();450 base.Dispose ();
450 }451 }
451452
453
452 #endregion 454 #endregion
455
456 #region IConfigurable implementation
457 public Bin GetConfiguration ()
458 {
459 return new DockyConfigurationWidget ();
460 }
461
462 public string Description {
463 get {
464 return "Docky configuration";
465 }
466 }
467
468 public new string Icon {
469 get {
470 return "panel";
471 }
472 }
473 #endregion
453 }474 }
454}475}
455476
=== modified file 'Do.Interface.Linux.Docky/src/Docky.Interface/Docky.Interface.Items/AbstractDockItem.cs'
--- Do.Interface.Linux.Docky/src/Docky.Interface/Docky.Interface.Items/AbstractDockItem.cs 2009-03-20 20:43:06 +0000
+++ Do.Interface.Linux.Docky/src/Docky.Interface/Docky.Interface.Items/AbstractDockItem.cs 2009-04-21 16:10:39 +0000
@@ -115,6 +115,10 @@
115 get { return ScalingType.Downscaled; }115 get { return ScalingType.Downscaled; }
116 }116 }
117 117
118 protected virtual string Icon {
119 get { return "default"; }
120 }
121
118 /// <value>122 /// <value>
119 /// Whether or not to draw an application present indicator123 /// Whether or not to draw an application present indicator
120 /// </value>124 /// </value>
@@ -145,7 +149,21 @@
145 ResetSurfaces ();149 ResetSurfaces ();
146 }150 }
147151
148 protected abstract Pixbuf GetSurfacePixbuf (int size);152 protected virtual Pixbuf GetSurfacePixbuf (int size)
153 {
154 if (Icon == null)
155 return null;
156
157 Gdk.Pixbuf pbuf = IconProvider.PixbufFromIconName (Icon, size);
158 if (pbuf.Height != size && pbuf.Width != size) {
159 double scale = (double)DockPreferences.FullIconSize / Math.Max (pbuf.Width, pbuf.Height);
160 Gdk.Pixbuf temp = pbuf.ScaleSimple ((int) (pbuf.Width * scale), (int) (pbuf.Height * scale), InterpType.Bilinear);
161 pbuf.Dispose ();
162 pbuf = temp;
163 }
164
165 return pbuf;
166 }
149167
150 /// <summary>168 /// <summary>
151 /// Called whenever the icon receives a click event169 /// Called whenever the icon receives a click event
152170
=== modified file 'Do.Interface.Linux.Docky/src/Docky.Interface/Docky.Interface.Items/ActionDockItem.cs'
--- Do.Interface.Linux.Docky/src/Docky.Interface/Docky.Interface.Items/ActionDockItem.cs 2009-02-06 23:29:30 +0000
+++ Do.Interface.Linux.Docky/src/Docky.Interface/Docky.Interface.Items/ActionDockItem.cs 2009-04-21 16:10:39 +0000
@@ -37,8 +37,8 @@
37 Act action;37 Act action;
38 Do.Universe.Item target_item;38 Do.Universe.Item target_item;
39 39
40 string Icon { 40 protected override string Icon {
41 get { return action.Icon; } 41 get { return action.Icon; }
42 }42 }
43 43
44 public ActionDockItem(Act action, Do.Universe.Item targetItem)44 public ActionDockItem(Act action, Do.Universe.Item targetItem)
@@ -48,19 +48,6 @@
48 SetText (action.Name);48 SetText (action.Name);
49 }49 }
50 50
51 protected override Pixbuf GetSurfacePixbuf (int size)
52 {
53 Gdk.Pixbuf pbuf = IconProvider.PixbufFromIconName (Icon, size);
54 if (pbuf.Height != size && pbuf.Width != size) {
55 double scale = (double)DockPreferences.FullIconSize / Math.Max (pbuf.Width, pbuf.Height);
56 Gdk.Pixbuf temp = pbuf.ScaleSimple ((int) (pbuf.Width * scale), (int) (pbuf.Height * scale), InterpType.Bilinear);
57 pbuf.Dispose ();
58 pbuf = temp;
59 }
60
61 return pbuf;
62 }
63
64 public override void Clicked (uint button, ModifierType state, Gdk.Point position)51 public override void Clicked (uint button, ModifierType state, Gdk.Point position)
65 {52 {
66 if (button == 1) {53 if (button == 1) {
6754
=== modified file 'Do.Interface.Linux.Docky/src/Docky.Interface/Docky.Interface.Items/ClockDockItem.cs'
--- Do.Interface.Linux.Docky/src/Docky.Interface/Docky.Interface.Items/ClockDockItem.cs 2009-02-22 05:18:44 +0000
+++ Do.Interface.Linux.Docky/src/Docky.Interface/Docky.Interface.Items/ClockDockItem.cs 2009-04-21 16:10:39 +0000
@@ -80,11 +80,6 @@
80 return true;80 return true;
81 }81 }
82 82
83 protected override Pixbuf GetSurfacePixbuf (int size)
84 {
85 return null;
86 }
87
88 void RenderFileOntoContext (Context cr, string file, int size)83 void RenderFileOntoContext (Context cr, string file, int size)
89 {84 {
90 if (!File.Exists (file))85 if (!File.Exists (file))
9186
=== modified file 'Do.Interface.Linux.Docky/src/Docky.Interface/Docky.Interface.Items/DoDockItem.cs'
--- Do.Interface.Linux.Docky/src/Docky.Interface/Docky.Interface.Items/DoDockItem.cs 2009-03-08 01:18:43 +0000
+++ Do.Interface.Linux.Docky/src/Docky.Interface/Docky.Interface.Items/DoDockItem.cs 2009-04-21 16:10:39 +0000
@@ -40,10 +40,13 @@
40 40
41 public class DoDockItem : AbstractDockItem, IRightClickable41 public class DoDockItem : AbstractDockItem, IRightClickable
42 {42 {
43 const string DoIcon = "gnome-do";
44 public const string EnableIcon = "gtk-apply";43 public const string EnableIcon = "gtk-apply";
45 public const string DisableIcon = "gtk-remove";44 public const string DisableIcon = "gtk-remove";
46 const string Text = "GNOME Do";45 const string Text = "GNOME Do";
46
47 protected override string Icon {
48 get { return "gnome-do"; }
49 }
4750
48 HotSeatPainter hot_seat_painter;51 HotSeatPainter hot_seat_painter;
49 52
@@ -54,13 +57,6 @@
54 return ScalingType.HighLow;57 return ScalingType.HighLow;
55 }58 }
56 }59 }
57
58
59 protected override Pixbuf GetSurfacePixbuf (int size)
60 {
61 return IconProvider.PixbufFromIconName (DoIcon, size);
62 }
63
64 60
65 public override void Clicked (uint button, ModifierType state, Gdk.Point position)61 public override void Clicked (uint button, ModifierType state, Gdk.Point position)
66 {62 {
@@ -79,10 +75,6 @@
79 75
80 SetText (Catalog.GetString (Text));76 SetText (Catalog.GetString (Text));
81 }77 }
82
83 #region IDisposable implementation
84
85 #endregion
86 78
87 public override bool Equals (AbstractDockItem other)79 public override bool Equals (AbstractDockItem other)
88 {80 {
@@ -100,62 +92,19 @@
100 yield return new SimpleMenuButtonArgs (() => DockPreferences.AutoHide = !DockPreferences.AutoHide, 92 yield return new SimpleMenuButtonArgs (() => DockPreferences.AutoHide = !DockPreferences.AutoHide,
101 Catalog.GetString ("Automatically Hide"), DockPreferences.AutoHide ? EnableIcon : DisableIcon).AsDark ();93 Catalog.GetString ("Automatically Hide"), DockPreferences.AutoHide ? EnableIcon : DisableIcon).AsDark ();
10294
103 if (!DockPreferences.AutoHide)
104 yield return new SimpleMenuButtonArgs (() => DockPreferences.AllowOverlap = !DockPreferences.AllowOverlap,
105 Catalog.GetString ("Allow Window Overlap"), DockPreferences.AllowOverlap ? EnableIcon : DisableIcon).AsDark ();
106
107 yield return new SimpleMenuButtonArgs (() => DockPreferences.IndicateMultipleWindows = !DockPreferences.IndicateMultipleWindows,
108 Catalog.GetString ("Advanced Indicators"), DockPreferences.IndicateMultipleWindows ? EnableIcon : DisableIcon).AsDark ();
109
110 yield return new SimpleMenuButtonArgs (() => DockPreferences.ZoomEnabled = !DockPreferences.ZoomEnabled, 95 yield return new SimpleMenuButtonArgs (() => DockPreferences.ZoomEnabled = !DockPreferences.ZoomEnabled,
111 Catalog.GetString ("Zoom Icons"), DockPreferences.ZoomEnabled ? EnableIcon : DisableIcon).AsDark ();96 Catalog.GetString ("Zoom Icons"), DockPreferences.ZoomEnabled ? EnableIcon : DisableIcon).AsDark ();
112 97
113// if (DockPreferences.ZoomEnabled) {
114// yield return new SeparatorMenuButtonArgs ();
115// yield return new WidgetMenuArgs (BuildScaleWidget ());
116// }
117
118 if (Gdk.Screen.Default.NMonitors > 1)98 if (Gdk.Screen.Default.NMonitors > 1)
119 yield return new SimpleMenuButtonArgs (() => DockPreferences.Monitor++,99 yield return new SimpleMenuButtonArgs (() => DockPreferences.Monitor++,
120 Catalog.GetString ("Switch Monitors"), "display").AsDark ();100 Catalog.GetString ("Switch Monitors"), "display").AsDark ();
121 101
122 yield return new SeparatorMenuButtonArgs ();
123
124 foreach (AbstractDockletItem dockitem in DockServices.DockletService.Docklets) {
125 yield return new ToggleDockletMenuButtonArgs (dockitem).AsDark ();
126 }
127
128 foreach (IRunnableItem item in Services.Application.MainMenuItems) {102 foreach (IRunnableItem item in Services.Application.MainMenuItems) {
129 yield return new SeparatorMenuButtonArgs ();103 yield return new SeparatorMenuButtonArgs ();
130 yield return new RunnableMenuButtonArgs (item);104 yield return new RunnableMenuButtonArgs (item);
131 }105 }
132 }106 }
133
134 void HandleValueChanged(object sender, EventArgs e)
135 {
136 if (!(sender is HScale)) return;
137
138 HScale scale = sender as HScale;
139 DockPreferences.ZoomPercent = scale.Value;
140 }
141 107
142 #endregion 108 #endregion
143
144 Gtk.HScale BuildScaleWidget ()
145 {
146 Gtk.HScale hscale = new Gtk.HScale (1.1, 4, .1);
147 hscale.Value = DockPreferences.ZoomPercent;
148 hscale.Name = "Zoom";
149 hscale.CanFocus = false;
150 hscale.FormatValue +=HandleFormatValue;
151 hscale.ModifyFg (StateType.Normal, new Gdk.Color (byte.MaxValue, byte.MaxValue, byte.MaxValue));
152 hscale.ValueChanged +=HandleValueChanged;
153 return hscale;
154 }
155
156 void HandleFormatValue(object o, FormatValueArgs args)
157 {
158 args.RetVal = string.Format ("{0}%", Math.Round (args.Value * 100));
159 }
160 }109 }
161}110}
162111
=== modified file 'Do.Interface.Linux.Docky/src/Docky.Interface/Docky.Interface.Items/HotSeatProxyItem.cs'
--- Do.Interface.Linux.Docky/src/Docky.Interface/Docky.Interface.Items/HotSeatProxyItem.cs 2009-02-06 23:29:30 +0000
+++ Do.Interface.Linux.Docky/src/Docky.Interface/Docky.Interface.Items/HotSeatProxyItem.cs 2009-04-21 16:10:39 +0000
@@ -113,11 +113,6 @@
113 this.inner = inner;113 this.inner = inner;
114 }114 }
115 115
116 protected override Pixbuf GetSurfacePixbuf (int size)
117 {
118 return null;
119 }
120
121 public override Surface GetIconSurface (Cairo.Surface similar, int targetSize, out int actualSize)116 public override Surface GetIconSurface (Cairo.Surface similar, int targetSize, out int actualSize)
122 {117 {
123 return inner.GetIconSurface (similar, targetSize, out actualSize);118 return inner.GetIconSurface (similar, targetSize, out actualSize);
124119
=== modified file 'Do.Interface.Linux.Docky/src/Docky.Interface/Docky.Interface.Items/ItemDockItem.cs'
--- Do.Interface.Linux.Docky/src/Docky.Interface/Docky.Interface.Items/ItemDockItem.cs 2009-04-07 06:35:47 +0000
+++ Do.Interface.Linux.Docky/src/Docky.Interface/Docky.Interface.Items/ItemDockItem.cs 2009-04-21 16:10:39 +0000
@@ -60,7 +60,7 @@
60 get { return accepting_drops; } 60 get { return accepting_drops; }
61 }61 }
62 62
63 string Icon { 63 protected override string Icon {
64 get { return element.Icon; } 64 get { return element.Icon; }
65 }65 }
66 66
@@ -205,19 +205,6 @@
205 return false;205 return false;
206 }206 }
207 207
208 protected override Gdk.Pixbuf GetSurfacePixbuf (int size)
209 {
210 Gdk.Pixbuf pbuf = IconProvider.PixbufFromIconName (Icon, size);
211 if (pbuf.Height != size && pbuf.Width != size) {
212 double scale = (double)DockPreferences.FullIconSize / Math.Max (pbuf.Width, pbuf.Height);
213 Gdk.Pixbuf temp = pbuf.ScaleSimple ((int) (pbuf.Width * scale), (int) (pbuf.Height * scale), InterpType.Bilinear);
214 pbuf.Dispose ();
215 pbuf = temp;
216 }
217
218 return pbuf;
219 }
220
221 public override Pixbuf GetDragPixbuf ()208 public override Pixbuf GetDragPixbuf ()
222 {209 {
223 if (drag_pixbuf == null)210 if (drag_pixbuf == null)
224211
=== modified file 'Do.Interface.Linux.Docky/src/Docky.Interface/Docky.Interface.Items/SeparatorItem.cs'
--- Do.Interface.Linux.Docky/src/Docky.Interface/Docky.Interface.Items/SeparatorItem.cs 2009-02-23 18:11:06 +0000
+++ Do.Interface.Linux.Docky/src/Docky.Interface/Docky.Interface.Items/SeparatorItem.cs 2009-04-21 16:10:39 +0000
@@ -59,12 +59,6 @@
59 sr = null;59 sr = null;
60 }60 }
61 61
62 protected override Pixbuf GetSurfacePixbuf (int size)
63 {
64 return null;
65 }
66
67
68 public override Surface GetIconSurface (Surface buffer, int targetSize, out int actualSize)62 public override Surface GetIconSurface (Surface buffer, int targetSize, out int actualSize)
69 {63 {
70 actualSize = DockPreferences.IconSize;64 actualSize = DockPreferences.IconSize;
7165
=== modified file 'Do.Interface.Linux.Docky/src/Docky.Interface/Docky.Interface.Items/TrashDockItem.cs'
--- Do.Interface.Linux.Docky/src/Docky.Interface/Docky.Interface.Items/TrashDockItem.cs 2009-04-07 06:26:08 +0000
+++ Do.Interface.Linux.Docky/src/Docky.Interface/Docky.Interface.Items/TrashDockItem.cs 2009-04-21 16:10:39 +0000
@@ -53,11 +53,16 @@
53 }53 }
54 54
55 public override string Name {55 public override string Name {
56 get { return "Trash"; }
57 }
58
59 protected override string Icon {
56 get {60 get {
57 return "Trash";61 if (Directory.Exists (Trash) && (Directory.GetFiles (Trash).Any () || Directory.GetDirectories (Trash).Any ()))
62 return TrashFullIcon;
63 return TrashEmptyIcon;
58 }64 }
59 }65 }
60
61 66
62 public TrashDockItem()67 public TrashDockItem()
63 {68 {
@@ -82,13 +87,6 @@
82 RedrawIcon ();87 RedrawIcon ();
83 });88 });
84 }89 }
85
86 protected override Pixbuf GetSurfacePixbuf (int size)
87 {
88 if (Directory.Exists (Trash) && (Directory.GetFiles (Trash).Any () || Directory.GetDirectories (Trash).Any ()))
89 return IconProvider.PixbufFromIconName (TrashFullIcon, size);
90 return IconProvider.PixbufFromIconName (TrashEmptyIcon, size);
91 }
9290
93 public override bool ReceiveItem (string item)91 public override bool ReceiveItem (string item)
94 {92 {
9593
=== added file 'Do.Interface.Linux.Docky/src/Docky.Interface/DockyConfigurationWidget.cs'
--- Do.Interface.Linux.Docky/src/Docky.Interface/DockyConfigurationWidget.cs 1970-01-01 00:00:00 +0000
+++ Do.Interface.Linux.Docky/src/Docky.Interface/DockyConfigurationWidget.cs 2009-04-21 02:15:39 +0000
@@ -0,0 +1,206 @@
1//
2// Copyright (C) 2009 GNOME Do
3//
4// This program is free software: you can redistribute it and/or modify
5// it under the terms of the GNU General Public License as published by
6// the Free Software Foundation, either version 3 of the License, or
7// (at your option) any later version.
8//
9// This program is distributed in the hope that it will be useful,
10// but WITHOUT ANY WARRANTY; without even the implied warranty of
11// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
12// GNU General Public License for more details.
13//
14// You should have received a copy of the GNU General Public License
15// along with this program. If not, see <http://www.gnu.org/licenses/>.
16//
17
18using System;
19using System.Collections.Generic;
20using System.Linq;
21
22using Cairo;
23using Gdk;
24using Gtk;
25
26using Docky.Utilities;
27using Docky.Core;
28
29namespace Docky.Interface
30{
31
32
33 [System.ComponentModel.ToolboxItem(true)]
34 public partial class DockyConfigurationWidget : Gtk.Bin
35 {
36 NodeView docklets_nodeview;
37
38 [TreeNode (ListOnly=true)]
39 class DockletTreeNode : TreeNode {
40 AbstractDockletItem docklet;
41
42 public DockletTreeNode (AbstractDockletItem docklet)
43 {
44 this.docklet = docklet;
45 }
46
47 [TreeNodeValue (Column=0)]
48 public bool Enabled {
49 get { return DockServices.DockletService.ActiveDocklets.Contains (docklet); }
50 }
51
52 [TreeNodeValue (Column=1)]
53 public string Name {
54 get { return docklet.Name; }
55 }
56
57 public void Toggle ()
58 {
59 DockServices.DockletService.ToggleDocklet (docklet);
60 }
61 }
62
63 bool setup = false;
64
65 NodeStore store;
66 NodeStore Store {
67 get {
68 if (store == null) {
69 store = new NodeStore (typeof (DockletTreeNode));
70
71 }
72 return store;
73 }
74 }
75
76 public DockyConfigurationWidget()
77 {
78 setup = true;
79 this.Build();
80
81 zoom_scale.Digits = 1;
82 zoom_scale.SetRange (1.1, 4);
83 zoom_scale.SetIncrements (.1, .1);
84 zoom_scale.Value = DockPreferences.ZoomPercent;
85
86 zoom_width_scale.Digits = 0;
87 zoom_width_scale.SetRange (200, 500);
88 zoom_width_scale.SetIncrements (10, 10);
89 zoom_width_scale.Value = DockPreferences.ZoomSize;
90
91 advanced_indicators_checkbutton.Active = DockPreferences.IndicateMultipleWindows;
92 autohide_checkbutton.Active = DockPreferences.AutoHide;
93 window_overlap_checkbutton.Active = DockPreferences.AllowOverlap;
94 zoom_checkbutton.Active = DockPreferences.ZoomEnabled;
95
96 orientation_combobox.AppendText (DockOrientation.Bottom.ToString ());
97 orientation_combobox.AppendText (DockOrientation.Top.ToString ());
98 orientation_combobox.Active = DockPreferences.Orientation == DockOrientation.Bottom ? 0 : 1;
99
100 BuildDocklets ();
101
102 SetSensativity ();
103
104 DockPreferences.IconSizeChanged += HandleIconSizeChanged;
105
106 Gtk.Application.Invoke (delegate { setup = false; });
107 }
108
109 void HandleIconSizeChanged()
110 {
111 SetSensativity ();
112 }
113
114 void BuildDocklets ()
115 {
116 docklets_nodeview = new NodeView (Store);
117 docklets_nodeview.RulesHint = true;
118 scrolled_window.Add (docklets_nodeview);
119
120 Gtk.CellRendererToggle toggle = new Gtk.CellRendererToggle ();
121 toggle.Toggled += HandleToggled;
122 docklets_nodeview.AppendColumn ("Enabled", toggle, "active", 0);
123 docklets_nodeview.AppendColumn ("Name", new Gtk.CellRendererText (), "text", 1);
124
125 docklets_nodeview.HeadersVisible = false;
126
127 foreach (AbstractDockletItem adi in DockServices.DockletService.Docklets) {
128 Store.AddNode (new DockletTreeNode (adi));
129 }
130
131 scrolled_window.ShowAll ();
132 }
133
134 void SetSensativity ()
135 {
136 zoom_scale.Sensitive =
137 zoom_width_scale.Sensitive =
138 zoom_size_label.Sensitive =
139 zoom_width_label.Sensitive =
140 DockPreferences.ZoomEnabled;
141 }
142
143 void HandleToggled (object o, ToggledArgs args)
144 {
145 DockletTreeNode node = Store.GetNode (new Gtk.TreePath (args.Path)) as DockletTreeNode;
146 node.Toggle ();
147 }
148
149 protected virtual void OnZoomScaleFormatValue (object o, Gtk.FormatValueArgs args)
150 {
151 args.RetVal = string.Format ("{0}%", Math.Round (args.Value * 100));
152 }
153
154 protected virtual void OnZoomScaleValueChanged (object sender, System.EventArgs e)
155 {
156 if (setup) return;
157 if (!(sender is HScale)) return;
158
159 HScale scale = sender as HScale;
160 DockPreferences.ZoomPercent = scale.Value;
161 }
162
163 protected virtual void OnAdvancedIndicatorsCheckbuttonToggled (object sender, System.EventArgs e)
164 {
165 if (setup) return;
166 DockPreferences.IndicateMultipleWindows = advanced_indicators_checkbutton.Active;
167 }
168
169 protected virtual void OnZoomCheckbuttonToggled (object sender, System.EventArgs e)
170 {
171 if (setup) return;
172 DockPreferences.ZoomEnabled = zoom_checkbutton.Active;
173 }
174
175 protected virtual void OnWindowOverlapCheckbuttonToggled (object sender, System.EventArgs e)
176 {
177 if (setup) return;
178 DockPreferences.AllowOverlap = window_overlap_checkbutton.Active;
179 }
180
181 protected virtual void OnAutohideCheckbuttonToggled (object sender, System.EventArgs e)
182 {
183 if (setup) return;
184 DockPreferences.AutoHide = autohide_checkbutton.Active;
185 }
186
187 protected virtual void OnOrientationComboboxChanged (object sender, System.EventArgs e)
188 {
189 if (setup) return;
190 DockPreferences.Orientation = (DockOrientation) orientation_combobox.Active;
191 }
192
193 protected virtual void OnZoomWidthScaleValueChanged (object sender, System.EventArgs e)
194 {
195 if (setup) return;
196 DockPreferences.ZoomSize = (int) zoom_width_scale.Value;
197 }
198
199 public override void Dispose ()
200 {
201 DockPreferences.IconSizeChanged -= HandleIconSizeChanged;
202 base.Dispose ();
203 }
204
205 }
206}
0207
=== modified file 'Do.Interface.Linux.Docky/src/Docky.Utilities/DockPreferences.cs'
--- Do.Interface.Linux.Docky/src/Docky.Utilities/DockPreferences.cs 2009-03-04 19:07:54 +0000
+++ Do.Interface.Linux.Docky/src/Docky.Utilities/DockPreferences.cs 2009-04-20 13:24:35 +0000
@@ -37,6 +37,7 @@
37 public static event Action AutomaticIconsChanged;37 public static event Action AutomaticIconsChanged;
38 public static event Action MonitorChanged;38 public static event Action MonitorChanged;
39 public static event Action AllowOverlapChanged;39 public static event Action AllowOverlapChanged;
40 public static event Action OrientationChanged;
40 41
41 public const int IconBorderWidth = 2;42 public const int IconBorderWidth = 2;
42 public const string HighlightFormat = "<span foreground=\"#5599ff\">{0}</span>";43 public const string HighlightFormat = "<span foreground=\"#5599ff\">{0}</span>";
@@ -221,8 +222,12 @@
221 return orientation;222 return orientation;
222 }223 }
223 set {224 set {
225 if (orientation == value)
226 return;
224 orientation = value;227 orientation = value;
225 prefs.Set ("Orientation", value.ToString ());228 prefs.Set ("Orientation", value.ToString ());
229 if (OrientationChanged != null)
230 OrientationChanged ();
226 }231 }
227 }232 }
228233
229234
=== modified file 'Do.Interface.Linux.GlassFrame/Do.Interface.Linux.GlassFrame.mdp'
--- Do.Interface.Linux.GlassFrame/Do.Interface.Linux.GlassFrame.mdp 2009-01-27 03:23:24 +0000
+++ Do.Interface.Linux.GlassFrame/Do.Interface.Linux.GlassFrame.mdp 2009-04-20 00:12:53 +0000
@@ -1,10 +1,10 @@
1<Project name="Do.Interface.Linux.GlassFrame" fileversion="2.0" language="C#" clr-version="Net_2_0" targetFramework="2.0" ctype="DotNetProject">1<Project name="Do.Interface.Linux.GlassFrame" fileversion="2.0" language="C#" clr-version="Net_2_0" targetFramework="3.5" ctype="DotNetProject">
2 <Configurations active="Debug">2 <Configurations active="Debug">
3 <Configuration name="Debug" ctype="DotNetProjectConfiguration">3 <Configuration name="Debug" ctype="DotNetProjectConfiguration">
4 <Output directory="bin/Debug" assembly="Do.Interface.Linux.GlassFrame" />4 <Output directory="bin/Debug" assembly="Do.Interface.Linux.GlassFrame" />
5 <Build debugmode="True" target="Library" />5 <Build debugmode="True" target="Library" />
6 <Execution runwithwarnings="True" consolepause="False" runtime="MsNet" clr-version="Net_2_0" />6 <Execution runwithwarnings="True" consolepause="False" runtime="MsNet" clr-version="Net_2_0" />
7 <CodeGeneration compiler="Mcs" warninglevel="4" optimize="False" unsafecodeallowed="False" generateoverflowchecks="False" definesymbols="DEBUG" generatexmldocumentation="False" ctype="CSharpCompilerParameters" />7 <CodeGeneration compiler="Mcs" warninglevel="4" optimize="True" unsafecodeallowed="False" generateoverflowchecks="True" definesymbols="DEBUG" generatexmldocumentation="False" ctype="CSharpCompilerParameters" />
8 </Configuration>8 </Configuration>
9 <Configuration name="Release" ctype="DotNetProjectConfiguration">9 <Configuration name="Release" ctype="DotNetProjectConfiguration">
10 <Output directory="bin/Release" assembly="Do.Interface.Linux.GlassFrame" />10 <Output directory="bin/Release" assembly="Do.Interface.Linux.GlassFrame" />
@@ -30,5 +30,6 @@
30 <ProjectReference type="Gac" localcopy="True" refto="System.Core, Version=3.5.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />30 <ProjectReference type="Gac" localcopy="True" refto="System.Core, Version=3.5.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
31 <ProjectReference type="Project" localcopy="True" refto="Do.Interface.Linux" />31 <ProjectReference type="Project" localcopy="True" refto="Do.Interface.Linux" />
32 <ProjectReference type="Project" localcopy="True" refto="Do.Platform" />32 <ProjectReference type="Project" localcopy="True" refto="Do.Platform" />
33 <ProjectReference type="Project" localcopy="True" refto="Do.Interface.Linux.AnimationBase" />
33 </References>34 </References>
34</Project>35</Project>
35\ No newline at end of file36\ No newline at end of file
3637
=== modified file 'Do.Interface.Linux.GlassFrame/Makefile.am'
--- Do.Interface.Linux.GlassFrame/Makefile.am 2008-12-15 22:25:09 +0000
+++ Do.Interface.Linux.GlassFrame/Makefile.am 2009-04-20 00:15:20 +0000
@@ -20,4 +20,5 @@
2020
21PROJECT_REFERENCES = \21PROJECT_REFERENCES = \
22 Do.Interface.Linux \22 Do.Interface.Linux \
23 Do.Interface.Linux.AnimationBase \
23 Do.Platform24 Do.Platform
2425
=== modified file 'Do.Interface.Linux.HUD/Do.Interface.Linux.HUD.mdp'
--- Do.Interface.Linux.HUD/Do.Interface.Linux.HUD.mdp 2009-01-27 03:23:24 +0000
+++ Do.Interface.Linux.HUD/Do.Interface.Linux.HUD.mdp 2009-04-20 00:12:53 +0000
@@ -1,10 +1,10 @@
1<Project name="Do.Interface.Linux.HUD" fileversion="2.0" language="C#" clr-version="Net_2_0" targetFramework="2.0" ctype="DotNetProject">1<Project name="Do.Interface.Linux.HUD" fileversion="2.0" language="C#" clr-version="Net_2_0" targetFramework="3.5" ctype="DotNetProject">
2 <Configurations active="Debug">2 <Configurations active="Debug">
3 <Configuration name="Debug" ctype="DotNetProjectConfiguration">3 <Configuration name="Debug" ctype="DotNetProjectConfiguration">
4 <Output directory="bin/Debug" assembly="Do.Interface.Linux.HUD" />4 <Output directory="bin/Debug" assembly="Do.Interface.Linux.HUD" />
5 <Build debugmode="True" target="Library" />5 <Build debugmode="True" target="Library" />
6 <Execution runwithwarnings="True" consolepause="False" runtime="MsNet" clr-version="Net_2_0" />6 <Execution runwithwarnings="True" consolepause="False" runtime="MsNet" clr-version="Net_2_0" />
7 <CodeGeneration compiler="Mcs" warninglevel="4" optimize="False" unsafecodeallowed="False" generateoverflowchecks="False" definesymbols="DEBUG" generatexmldocumentation="False" ctype="CSharpCompilerParameters" />7 <CodeGeneration compiler="Mcs" warninglevel="4" optimize="True" unsafecodeallowed="False" generateoverflowchecks="True" definesymbols="DEBUG" generatexmldocumentation="False" ctype="CSharpCompilerParameters" />
8 </Configuration>8 </Configuration>
9 <Configuration name="Release" ctype="DotNetProjectConfiguration">9 <Configuration name="Release" ctype="DotNetProjectConfiguration">
10 <Output directory="bin/Release" assembly="Do.Interface.Linux.HUD" />10 <Output directory="bin/Release" assembly="Do.Interface.Linux.HUD" />
@@ -29,5 +29,6 @@
29 <ProjectReference type="Gac" localcopy="True" refto="gtk-sharp, Version=2.12.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f" />29 <ProjectReference type="Gac" localcopy="True" refto="gtk-sharp, Version=2.12.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f" />
30 <ProjectReference type="Gac" localcopy="True" refto="Mono.Cairo, Version=2.0.0.0, Culture=neutral, PublicKeyToken=0738eb9f132ed756" />30 <ProjectReference type="Gac" localcopy="True" refto="Mono.Cairo, Version=2.0.0.0, Culture=neutral, PublicKeyToken=0738eb9f132ed756" />
31 <ProjectReference type="Gac" localcopy="True" refto="System.Core, Version=3.5.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />31 <ProjectReference type="Gac" localcopy="True" refto="System.Core, Version=3.5.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
32 <ProjectReference type="Project" localcopy="True" refto="Do.Interface.Linux.AnimationBase" />
32 </References>33 </References>
33</Project>34</Project>
34\ No newline at end of file35\ No newline at end of file
3536
=== modified file 'Do.Interface.Linux.HUD/Makefile.am'
--- Do.Interface.Linux.HUD/Makefile.am 2008-12-15 22:25:09 +0000
+++ Do.Interface.Linux.HUD/Makefile.am 2009-04-20 00:15:20 +0000
@@ -20,4 +20,5 @@
2020
21PROJECT_REFERENCES = \21PROJECT_REFERENCES = \
22 Do.Interface.Linux \22 Do.Interface.Linux \
23 Do.Interface.Linux.AnimationBase \
23 Do.Platform24 Do.Platform
2425
=== modified file 'Do.Interface.Linux.Mini/Do.Interface.Linux.Mini.mdp'
--- Do.Interface.Linux.Mini/Do.Interface.Linux.Mini.mdp 2009-01-27 03:23:24 +0000
+++ Do.Interface.Linux.Mini/Do.Interface.Linux.Mini.mdp 2009-04-20 00:12:53 +0000
@@ -1,10 +1,10 @@
1<Project name="Do.Interface.Linux.Mini" fileversion="2.0" language="C#" clr-version="Net_2_0" targetFramework="2.0" ctype="DotNetProject">1<Project name="Do.Interface.Linux.Mini" fileversion="2.0" language="C#" clr-version="Net_2_0" targetFramework="3.5" ctype="DotNetProject">
2 <Configurations active="Debug">2 <Configurations active="Debug">
3 <Configuration name="Debug" ctype="DotNetProjectConfiguration">3 <Configuration name="Debug" ctype="DotNetProjectConfiguration">
4 <Output directory="bin/Debug" assembly="Do.Interface.Linux.Mini" />4 <Output directory="bin/Debug" assembly="Do.Interface.Linux.Mini" />
5 <Build debugmode="True" target="Library" />5 <Build debugmode="True" target="Library" />
6 <Execution runwithwarnings="True" consolepause="False" runtime="MsNet" clr-version="Net_2_0" />6 <Execution runwithwarnings="True" consolepause="False" runtime="MsNet" clr-version="Net_2_0" />
7 <CodeGeneration compiler="Mcs" warninglevel="4" optimize="False" unsafecodeallowed="False" generateoverflowchecks="False" definesymbols="DEBUG" generatexmldocumentation="False" ctype="CSharpCompilerParameters" />7 <CodeGeneration compiler="Mcs" warninglevel="4" optimize="True" unsafecodeallowed="False" generateoverflowchecks="True" definesymbols="DEBUG" generatexmldocumentation="False" ctype="CSharpCompilerParameters" />
8 </Configuration>8 </Configuration>
9 <Configuration name="Release" ctype="DotNetProjectConfiguration">9 <Configuration name="Release" ctype="DotNetProjectConfiguration">
10 <Output directory="bin/Release" assembly="Do.Interface.Linux.Mini" />10 <Output directory="bin/Release" assembly="Do.Interface.Linux.Mini" />
@@ -30,5 +30,6 @@
30 <ProjectReference type="Gac" localcopy="True" refto="gdk-sharp, Version=2.12.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f" />30 <ProjectReference type="Gac" localcopy="True" refto="gdk-sharp, Version=2.12.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f" />
31 <ProjectReference type="Project" localcopy="True" refto="Do.Platform" />31 <ProjectReference type="Project" localcopy="True" refto="Do.Platform" />
32 <ProjectReference type="Project" localcopy="True" refto="Do.Interface.Linux" />32 <ProjectReference type="Project" localcopy="True" refto="Do.Interface.Linux" />
33 <ProjectReference type="Project" localcopy="True" refto="Do.Interface.Linux.AnimationBase" />
33 </References>34 </References>
34</Project>35</Project>
35\ No newline at end of file36\ No newline at end of file
3637
=== modified file 'Do.Interface.Linux.Mini/Makefile.am'
--- Do.Interface.Linux.Mini/Makefile.am 2008-12-15 22:25:09 +0000
+++ Do.Interface.Linux.Mini/Makefile.am 2009-04-20 00:15:20 +0000
@@ -20,4 +20,5 @@
2020
21PROJECT_REFERENCES = \21PROJECT_REFERENCES = \
22 Do.Interface.Linux \22 Do.Interface.Linux \
23 Do.Interface.Linux.AnimationBase \
23 Do.Platform24 Do.Platform
2425
=== modified file 'Do.Interface.Linux/Do.Interface.Linux.mdp'
--- Do.Interface.Linux/Do.Interface.Linux.mdp 2009-01-27 03:23:24 +0000
+++ Do.Interface.Linux/Do.Interface.Linux.mdp 2009-04-20 00:12:53 +0000
@@ -1,4 +1,4 @@
1<Project name="Do.Interface.Linux" fileversion="2.0" language="C#" clr-version="Net_2_0" targetFramework="2.0" ctype="DotNetProject">1<Project name="Do.Interface.Linux" fileversion="2.0" language="C#" clr-version="Net_2_0" targetFramework="3.5" ctype="DotNetProject">
2 <Configurations active="Debug">2 <Configurations active="Debug">
3 <Configuration name="Debug" ctype="DotNetProjectConfiguration">3 <Configuration name="Debug" ctype="DotNetProjectConfiguration">
4 <Output directory="bin/Debug" assembly="Do.Interface.Linux" />4 <Output directory="bin/Debug" assembly="Do.Interface.Linux" />
@@ -21,7 +21,6 @@
21 <File name="Resources" subtype="Directory" buildaction="Compile" />21 <File name="Resources" subtype="Directory" buildaction="Compile" />
22 <File name="Resources/Do.Interface.Linux.addin.xml" subtype="Code" buildaction="EmbedAsResource" />22 <File name="Resources/Do.Interface.Linux.addin.xml" subtype="Code" buildaction="EmbedAsResource" />
23 <File name="src/Do.Interface/IDoWindow.cs" subtype="Code" buildaction="Compile" />23 <File name="src/Do.Interface/IDoWindow.cs" subtype="Code" buildaction="Compile" />
24 <File name="src/Do.Interface/IRenderTheme.cs" subtype="Code" buildaction="Compile" />
25 <File name="src/Do.Interface/IconCache.cs" subtype="Code" buildaction="Compile" />24 <File name="src/Do.Interface/IconCache.cs" subtype="Code" buildaction="Compile" />
26 <File name="src/Do.Interface/IUIContext.cs" subtype="Code" buildaction="Compile" />25 <File name="src/Do.Interface/IUIContext.cs" subtype="Code" buildaction="Compile" />
27 <File name="src/Do.Interface/ResultsWindowSelectionEventArgs.cs" subtype="Code" buildaction="Compile" />26 <File name="src/Do.Interface/ResultsWindowSelectionEventArgs.cs" subtype="Code" buildaction="Compile" />
@@ -39,22 +38,10 @@
39 <File name="src/Do.Interface/Do.Interface.Widgets/TextFrame.cs" subtype="Code" buildaction="Compile" />38 <File name="src/Do.Interface/Do.Interface.Widgets/TextFrame.cs" subtype="Code" buildaction="Compile" />
40 <File name="src/Do.Interface/Do.Interface.CairoUtils" subtype="Directory" buildaction="Compile" />39 <File name="src/Do.Interface/Do.Interface.CairoUtils" subtype="Directory" buildaction="Compile" />
41 <File name="src/Do.Interface/Do.Interface.CairoUtils/CairoUtils.cs" subtype="Code" buildaction="Compile" />40 <File name="src/Do.Interface/Do.Interface.CairoUtils/CairoUtils.cs" subtype="Code" buildaction="Compile" />
42 <File name="src/Do.Interface/Do.Interface.AnimationBase" subtype="Directory" buildaction="Compile" />
43 <File name="src/Do.Interface/Do.Interface.AnimationBase/Bezel.cs" subtype="Code" buildaction="Compile" />
44 <File name="src/Do.Interface/Do.Interface.AnimationBase/BezelColors.cs" subtype="Code" buildaction="Compile" />
45 <File name="src/Do.Interface/Do.Interface.AnimationBase/BezelDefaults.cs" subtype="Code" buildaction="Compile" />
46 <File name="src/Do.Interface/Do.Interface.AnimationBase/BezelDrawingArea.cs" subtype="Code" buildaction="Compile" />
47 <File name="src/Do.Interface/Do.Interface.AnimationBase/BezelDrawingContext.cs" subtype="Code" buildaction="Compile" />
48 <File name="src/Do.Interface/Do.Interface.AnimationBase/BezelGlassResults.cs" subtype="Code" buildaction="Compile" />
49 <File name="src/Do.Interface/Do.Interface.AnimationBase/BezelGlassWindow.cs" subtype="Code" buildaction="Compile" />
50 <File name="src/Do.Interface/Do.Interface.AnimationBase/BezelResultsDrawingArea.cs" subtype="Code" buildaction="Compile" />
51 <File name="src/Do.Interface/Do.Interface.AnimationBase/TextRenderer.cs" subtype="Code" buildaction="Compile" />
52 <File name="src/Do.Interface/IDoController.cs" subtype="Code" buildaction="Compile" />41 <File name="src/Do.Interface/IDoController.cs" subtype="Code" buildaction="Compile" />
53 <File name="src/Do.Interface/PixbufSurfaceCache.cs" subtype="Code" buildaction="Compile" />42 <File name="src/Do.Interface/PixbufSurfaceCache.cs" subtype="Code" buildaction="Compile" />
54 <File name="src/Do.Interface/PositionWindow.cs" subtype="Code" buildaction="Compile" />43 <File name="src/Do.Interface/PositionWindow.cs" subtype="Code" buildaction="Compile" />
55 <File name="src/Do.Interface/Util.cs" subtype="Code" buildaction="Compile" />44 <File name="src/Do.Interface/Util.cs" subtype="Code" buildaction="Compile" />
56 <File name="src/Do.Interface/Do.Interface.AnimationBase/IRenderInterfaces.cs" subtype="Code" buildaction="Compile" />
57 <File name="src/Do.Interface/Do.Interface.AnimationBase/BezelGlassRenderClasses.cs" subtype="Code" buildaction="Compile" />
58 <File name="src/Do.Interface/SearchFinishState.cs" subtype="Code" buildaction="Compile" />45 <File name="src/Do.Interface/SearchFinishState.cs" subtype="Code" buildaction="Compile" />
59 <File name="Resources/settings-triangle.png" subtype="Code" buildaction="EmbedAsResource" />46 <File name="Resources/settings-triangle.png" subtype="Code" buildaction="EmbedAsResource" />
60 <File name="src/Do.Interface/InterfaceManager.cs" subtype="Code" buildaction="Compile" />47 <File name="src/Do.Interface/InterfaceManager.cs" subtype="Code" buildaction="Compile" />
@@ -72,8 +59,8 @@
72 <ProjectReference type="Gac" localcopy="True" refto="Mono.Cairo, Version=2.0.0.0, Culture=neutral, PublicKeyToken=0738eb9f132ed756" />59 <ProjectReference type="Gac" localcopy="True" refto="Mono.Cairo, Version=2.0.0.0, Culture=neutral, PublicKeyToken=0738eb9f132ed756" />
73 <ProjectReference type="Gac" localcopy="True" refto="pango-sharp, Version=2.12.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f" />60 <ProjectReference type="Gac" localcopy="True" refto="pango-sharp, Version=2.12.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f" />
74 <ProjectReference type="Gac" localcopy="True" refto="glib-sharp, Version=2.12.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f" />61 <ProjectReference type="Gac" localcopy="True" refto="glib-sharp, Version=2.12.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f" />
75 <ProjectReference type="Gac" localcopy="True" refto="gconf-sharp, Version=2.20.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f" />
76 <ProjectReference type="Gac" localcopy="True" refto="System.Core, Version=3.5.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />62 <ProjectReference type="Gac" localcopy="True" refto="System.Core, Version=3.5.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
77 <ProjectReference type="Gac" localcopy="True" refto="Mono.Addins, Version=0.3.0.0, Culture=neutral, PublicKeyToken=0738eb9f132ed756" />63 <ProjectReference type="Gac" localcopy="True" refto="Mono.Addins, Version=0.3.0.0, Culture=neutral, PublicKeyToken=0738eb9f132ed756" />
64 <ProjectReference type="Gac" localcopy="True" refto="gconf-sharp, Version=2.12.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f" />
78 </References>65 </References>
79</Project>
80\ No newline at end of file66\ No newline at end of file
67</Project>
8168
=== modified file 'Do.Interface.Linux/Makefile.am'
--- Do.Interface.Linux/Makefile.am 2009-01-05 21:11:58 +0000
+++ Do.Interface.Linux/Makefile.am 2009-04-20 00:24:22 +0000
@@ -8,17 +8,6 @@
8FILES = \8FILES = \
9 src/AssemblyInfo.cs \9 src/AssemblyInfo.cs \
10 src/Do.Interface/ClassicInterface/ClassicWindow.cs \10 src/Do.Interface/ClassicInterface/ClassicWindow.cs \
11 src/Do.Interface/Do.Interface.AnimationBase/Bezel.cs \
12 src/Do.Interface/Do.Interface.AnimationBase/BezelColors.cs \
13 src/Do.Interface/Do.Interface.AnimationBase/BezelDefaults.cs \
14 src/Do.Interface/Do.Interface.AnimationBase/BezelDrawingArea.cs \
15 src/Do.Interface/Do.Interface.AnimationBase/BezelDrawingContext.cs \
16 src/Do.Interface/Do.Interface.AnimationBase/BezelGlassRenderClasses.cs \
17 src/Do.Interface/Do.Interface.AnimationBase/BezelGlassResults.cs \
18 src/Do.Interface/Do.Interface.AnimationBase/BezelGlassWindow.cs \
19 src/Do.Interface/Do.Interface.AnimationBase/BezelResultsDrawingArea.cs \
20 src/Do.Interface/Do.Interface.AnimationBase/TextRenderer.cs \
21 src/Do.Interface/Do.Interface.AnimationBase/IRenderInterfaces.cs \
22 src/Do.Interface/Do.Interface.CairoUtils/CairoUtils.cs \11 src/Do.Interface/Do.Interface.CairoUtils/CairoUtils.cs \
23 src/Do.Interface/Do.Interface.Widgets/DefaultElements.cs \12 src/Do.Interface/Do.Interface.Widgets/DefaultElements.cs \
24 src/Do.Interface/Do.Interface.Widgets/Frame.cs \13 src/Do.Interface/Do.Interface.Widgets/Frame.cs \
@@ -30,7 +19,6 @@
30 src/Do.Interface/Do.Interface.Widgets/TextFrame.cs \19 src/Do.Interface/Do.Interface.Widgets/TextFrame.cs \
31 src/Do.Interface/IDoController.cs \20 src/Do.Interface/IDoController.cs \
32 src/Do.Interface/IDoWindow.cs \21 src/Do.Interface/IDoWindow.cs \
33 src/Do.Interface/IRenderTheme.cs \
34 src/Do.Interface/IUIContext.cs \22 src/Do.Interface/IUIContext.cs \
35 src/Do.Interface/IconCache.cs \23 src/Do.Interface/IconCache.cs \
36 src/Do.Interface/IconProvider.cs \24 src/Do.Interface/IconProvider.cs \
3725
=== modified file 'Do.Interface.Wink/Do.Interface.Wink.mdp'
--- Do.Interface.Wink/Do.Interface.Wink.mdp 2009-04-09 02:27:52 +0000
+++ Do.Interface.Wink/Do.Interface.Wink.mdp 2009-04-19 06:40:08 +0000
@@ -5,7 +5,7 @@
5 <Build debugmode="True" target="Library" />5 <Build debugmode="True" target="Library" />
6 <Execution runwithwarnings="True" consolepause="False" runtime="MsNet" />6 <Execution runwithwarnings="True" consolepause="False" runtime="MsNet" />
7 <EnvironmentVariables />7 <EnvironmentVariables />
8 <CodeGeneration compiler="Mcs" warninglevel="4" optimize="False" unsafecodeallowed="False" generateoverflowchecks="False" definesymbols="DEBUG" generatexmldocumentation="False" ctype="CSharpCompilerParameters" />8 <CodeGeneration compiler="Mcs" warninglevel="4" optimize="True" unsafecodeallowed="False" generateoverflowchecks="True" definesymbols="DEBUG" generatexmldocumentation="False" ctype="CSharpCompilerParameters" />
9 </Configuration>9 </Configuration>
10 <Configuration name="Release" ctype="DotNetProjectConfiguration">10 <Configuration name="Release" ctype="DotNetProjectConfiguration">
11 <Output directory="bin/Release" assembly="Do.Interface.Wnck" />11 <Output directory="bin/Release" assembly="Do.Interface.Wnck" />
1212
=== modified file 'Do.Interface.Wink/src/Do.Interface.Wink/Viewport.cs'
--- Do.Interface.Wink/src/Do.Interface.Wink/Viewport.cs 2009-04-09 02:32:20 +0000
+++ Do.Interface.Wink/src/Do.Interface.Wink/Viewport.cs 2009-04-21 04:12:30 +0000
@@ -48,18 +48,10 @@
48 48
49 public string Name { get; private set; }49 public string Name { get; private set; }
50 50
51 internal Rectangle Area {51 public Rectangle Area {
52 get { return area; }52 get { return area; }
53 }53 }
54 54
55 internal Viewport(string name, Rectangle area, Workspace parent)
56 {
57 this.area = area;
58 this.parent = parent;
59 Name = name;
60 window_states = new Dictionary<Wnck.Window, WindowState> ();
61 }
62
63 WindowMoveResizeMask MoveMask {55 WindowMoveResizeMask MoveMask {
64 get {56 get {
65 return WindowMoveResizeMask.X | WindowMoveResizeMask.Y;57 return WindowMoveResizeMask.X | WindowMoveResizeMask.Y;
@@ -81,6 +73,19 @@
81 }73 }
82 }74 }
83 75
76 internal Viewport(string name, Rectangle area, Workspace parent)
77 {
78 this.area = area;
79 this.parent = parent;
80 Name = name;
81 window_states = new Dictionary<Wnck.Window, WindowState> ();
82 }
83
84 public void Present ()
85 {
86 parent.Screen.MoveViewport (area.X, area.Y);
87 }
88
84 public bool Contains (Gdk.Point point)89 public bool Contains (Gdk.Point point)
85 {90 {
86 return area.Contains (point);91 return area.Contains (point);
8792
=== modified file 'Do.Platform.Linux/Do.Platform.Linux.mdp'
--- Do.Platform.Linux/Do.Platform.Linux.mdp 2009-02-17 23:43:18 +0000
+++ Do.Platform.Linux/Do.Platform.Linux.mdp 2009-04-20 00:12:53 +0000
@@ -1,10 +1,10 @@
1<Project name="Do.Platform.Linux" fileversion="2.0" language="C#" clr-version="Net_2_0" targetFramework="2.0" ctype="DotNetProject">1<Project name="Do.Platform.Linux" fileversion="2.0" language="C#" clr-version="Net_2_0" targetFramework="3.5" ctype="DotNetProject">
2 <Configurations active="Debug">2 <Configurations active="Debug">
3 <Configuration name="Debug" ctype="DotNetProjectConfiguration">3 <Configuration name="Debug" ctype="DotNetProjectConfiguration">
4 <Output directory="bin/Debug" assembly="Do.Platform.Linux" />4 <Output directory="bin/Debug" assembly="Do.Platform.Linux" />
5 <Build debugmode="True" target="Library" />5 <Build debugmode="True" target="Library" />
6 <Execution runwithwarnings="True" consolepause="False" runtime="MsNet" clr-version="Net_2_0" />6 <Execution runwithwarnings="True" consolepause="False" runtime="MsNet" clr-version="Net_2_0" />
7 <CodeGeneration compiler="Mcs" warninglevel="4" optimize="False" unsafecodeallowed="False" generateoverflowchecks="False" definesymbols="DEBUG" generatexmldocumentation="False" ctype="CSharpCompilerParameters" />7 <CodeGeneration compiler="Mcs" warninglevel="4" optimize="True" unsafecodeallowed="False" generateoverflowchecks="True" definesymbols="DEBUG" generatexmldocumentation="False" ctype="CSharpCompilerParameters" />
8 </Configuration>8 </Configuration>
9 <Configuration name="Release" ctype="DotNetProjectConfiguration">9 <Configuration name="Release" ctype="DotNetProjectConfiguration">
10 <Output directory="bin/Release" assembly="Do.Platform.Linux" />10 <Output directory="bin/Release" assembly="Do.Platform.Linux" />
@@ -59,7 +59,6 @@
59 <ProjectReference type="Gac" localcopy="True" refto="System.Core, Version=3.5.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />59 <ProjectReference type="Gac" localcopy="True" refto="System.Core, Version=3.5.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
60 <ProjectReference type="Gac" localcopy="True" refto="notify-sharp, Version=0.4.0.0, Culture=neutral, PublicKeyToken=2df29c54e245917a" />60 <ProjectReference type="Gac" localcopy="True" refto="notify-sharp, Version=0.4.0.0, Culture=neutral, PublicKeyToken=2df29c54e245917a" />
61 <ProjectReference type="Gac" localcopy="True" refto="glib-sharp, Version=2.12.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f" />61 <ProjectReference type="Gac" localcopy="True" refto="glib-sharp, Version=2.12.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f" />
62 <ProjectReference type="Project" localcopy="True" refto="Do.Interface.Linux" />
63 <ProjectReference type="Project" localcopy="True" refto="Do.Universe" />62 <ProjectReference type="Project" localcopy="True" refto="Do.Universe" />
64 <ProjectReference type="Gac" localcopy="True" refto="Gnome.Keyring, Version=1.0.0.0, Culture=neutral, PublicKeyToken=1a73e1bde00c9b66" />63 <ProjectReference type="Gac" localcopy="True" refto="Gnome.Keyring, Version=1.0.0.0, Culture=neutral, PublicKeyToken=1a73e1bde00c9b66" />
65 <ProjectReference type="Gac" localcopy="True" refto="nunit.framework, Version=2.2.0.0, Culture=neutral, PublicKeyToken=96d09a1eb7f44a77" />64 <ProjectReference type="Gac" localcopy="True" refto="nunit.framework, Version=2.2.0.0, Culture=neutral, PublicKeyToken=96d09a1eb7f44a77" />
@@ -67,5 +66,6 @@
67 <ProjectReference type="Gac" localcopy="True" refto="gconf-sharp, Version=2.12.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f" />66 <ProjectReference type="Gac" localcopy="True" refto="gconf-sharp, Version=2.12.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f" />
68 <ProjectReference type="Gac" localcopy="True" refto="NDesk.DBus, Version=1.0.0.0, Culture=neutral, PublicKeyToken=f6716e4f9b2ed099" />67 <ProjectReference type="Gac" localcopy="True" refto="NDesk.DBus, Version=1.0.0.0, Culture=neutral, PublicKeyToken=f6716e4f9b2ed099" />
69 <ProjectReference type="Gac" localcopy="True" refto="NDesk.DBus.GLib, Version=1.0.0.0, Culture=neutral, PublicKeyToken=f6716e4f9b2ed099" />68 <ProjectReference type="Gac" localcopy="True" refto="NDesk.DBus.GLib, Version=1.0.0.0, Culture=neutral, PublicKeyToken=f6716e4f9b2ed099" />
69 <ProjectReference type="Project" localcopy="True" refto="Do.Interface.Linux" />
70 </References>70 </References>
71</Project>71</Project>
72\ No newline at end of file72\ No newline at end of file
7373
=== modified file 'Do.Platform.OSX/Do.Platform.OSX.mdp'
--- Do.Platform.OSX/Do.Platform.OSX.mdp 2009-01-27 03:23:24 +0000
+++ Do.Platform.OSX/Do.Platform.OSX.mdp 2009-04-19 06:40:08 +0000
@@ -4,7 +4,7 @@
4 <Output directory="bin/Debug" assembly="Do.Platform.OSX" />4 <Output directory="bin/Debug" assembly="Do.Platform.OSX" />
5 <Build debugmode="True" target="Library" />5 <Build debugmode="True" target="Library" />
6 <Execution runwithwarnings="True" consolepause="False" runtime="MsNet" clr-version="Net_2_0" />6 <Execution runwithwarnings="True" consolepause="False" runtime="MsNet" clr-version="Net_2_0" />
7 <CodeGeneration compiler="Mcs" warninglevel="4" optimize="False" unsafecodeallowed="False" generateoverflowchecks="False" definesymbols="DEBUG" generatexmldocumentation="False" ctype="CSharpCompilerParameters" />7 <CodeGeneration compiler="Mcs" warninglevel="4" optimize="True" unsafecodeallowed="False" generateoverflowchecks="True" definesymbols="DEBUG" generatexmldocumentation="False" ctype="CSharpCompilerParameters" />
8 </Configuration>8 </Configuration>
9 <Configuration name="Release" ctype="DotNetProjectConfiguration">9 <Configuration name="Release" ctype="DotNetProjectConfiguration">
10 <Output directory="bin/Release" assembly="Do.Platform.OSX" />10 <Output directory="bin/Release" assembly="Do.Platform.OSX" />
1111
=== modified file 'Do.Platform.Windows/Do.Platform.Windows.mdp'
--- Do.Platform.Windows/Do.Platform.Windows.mdp 2009-01-27 03:23:24 +0000
+++ Do.Platform.Windows/Do.Platform.Windows.mdp 2009-04-19 06:40:08 +0000
@@ -4,7 +4,7 @@
4 <Output directory="bin/Debug" assembly="Do.Platform.Windows" />4 <Output directory="bin/Debug" assembly="Do.Platform.Windows" />
5 <Build debugmode="True" target="Library" />5 <Build debugmode="True" target="Library" />
6 <Execution runwithwarnings="True" consolepause="False" runtime="MsNet" clr-version="Net_2_0" />6 <Execution runwithwarnings="True" consolepause="False" runtime="MsNet" clr-version="Net_2_0" />
7 <CodeGeneration compiler="Mcs" warninglevel="4" optimize="False" unsafecodeallowed="False" generateoverflowchecks="False" definesymbols="DEBUG" generatexmldocumentation="False" ctype="CSharpCompilerParameters" />7 <CodeGeneration compiler="Mcs" warninglevel="4" optimize="True" unsafecodeallowed="False" generateoverflowchecks="True" definesymbols="DEBUG" generatexmldocumentation="False" ctype="CSharpCompilerParameters" />
8 </Configuration>8 </Configuration>
9 <Configuration name="Release" ctype="DotNetProjectConfiguration">9 <Configuration name="Release" ctype="DotNetProjectConfiguration">
10 <Output directory="bin/Release" assembly="Do.Platform.Windows" />10 <Output directory="bin/Release" assembly="Do.Platform.Windows" />
1111
=== modified file 'Do.Platform/Do.Platform.mdp'
--- Do.Platform/Do.Platform.mdp 2009-02-17 23:43:18 +0000
+++ Do.Platform/Do.Platform.mdp 2009-04-19 06:40:08 +0000
@@ -1,10 +1,10 @@
1<Project name="Do.Platform" fileversion="2.0" language="C#" clr-version="Net_2_0" targetFramework="2.0" ctype="DotNetProject">1<Project name="Do.Platform" fileversion="2.0" language="C#" clr-version="Net_2_0" targetFramework="3.5" ctype="DotNetProject">
2 <Configurations active="Debug">2 <Configurations active="Debug">
3 <Configuration name="Debug" ctype="DotNetProjectConfiguration">3 <Configuration name="Debug" ctype="DotNetProjectConfiguration">
4 <Output directory="bin/Debug" assembly="Do.Platform" />4 <Output directory="bin/Debug" assembly="Do.Platform" />
5 <Build debugmode="True" target="Library" />5 <Build debugmode="True" target="Library" />
6 <Execution runwithwarnings="True" consolepause="False" runtime="MsNet" clr-version="Net_2_0" />6 <Execution runwithwarnings="True" consolepause="False" runtime="MsNet" clr-version="Net_2_0" />
7 <CodeGeneration compiler="Mcs" warninglevel="4" optimize="False" unsafecodeallowed="False" generateoverflowchecks="False" definesymbols="DEBUG" generatexmldocumentation="False" ctype="CSharpCompilerParameters" />7 <CodeGeneration compiler="Mcs" warninglevel="4" optimize="True" unsafecodeallowed="False" generateoverflowchecks="True" definesymbols="DEBUG" generatexmldocumentation="False" ctype="CSharpCompilerParameters" />
8 </Configuration>8 </Configuration>
9 <Configuration name="Release" ctype="DotNetProjectConfiguration">9 <Configuration name="Release" ctype="DotNetProjectConfiguration">
10 <Output directory="bin/Release" assembly="Do.Platform" />10 <Output directory="bin/Release" assembly="Do.Platform" />
@@ -76,7 +76,6 @@
76 <File name="src/System/Linq/EnumerableExtensions.cs" subtype="Code" buildaction="Compile" />76 <File name="src/System/Linq/EnumerableExtensions.cs" subtype="Code" buildaction="Compile" />
77 <File name="src/Do.Platform/AbstractSystemService.cs" subtype="Code" buildaction="Compile" />77 <File name="src/Do.Platform/AbstractSystemService.cs" subtype="Code" buildaction="Compile" />
78 <File name="src/Do.Platform/Do.Platform.Default/DefaultSystemService.cs" subtype="Code" buildaction="Compile" />78 <File name="src/Do.Platform/Do.Platform.Default/DefaultSystemService.cs" subtype="Code" buildaction="Compile" />
79 <File name="src/Do.Platform/IAutostartService.cs" subtype="Code" buildaction="Compile" />
80 </Contents>79 </Contents>
81 <References>80 <References>
82 <ProjectReference type="Gac" localcopy="True" refto="System, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />81 <ProjectReference type="Gac" localcopy="True" refto="System, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
8382
=== modified file 'Do.Universe/Do.Universe.mdp'
--- Do.Universe/Do.Universe.mdp 2009-01-27 03:23:24 +0000
+++ Do.Universe/Do.Universe.mdp 2009-04-19 06:40:08 +0000
@@ -1,10 +1,10 @@
1<Project name="Do.Universe" fileversion="2.0" language="C#" clr-version="Net_2_0" targetFramework="2.0" ctype="DotNetProject">1<Project name="Do.Universe" fileversion="2.0" language="C#" clr-version="Net_2_0" targetFramework="3.5" ctype="DotNetProject">
2 <Configurations active="Debug">2 <Configurations active="Debug">
3 <Configuration name="Debug" ctype="DotNetProjectConfiguration">3 <Configuration name="Debug" ctype="DotNetProjectConfiguration">
4 <Output directory="bin/Debug" assembly="Do.Universe" />4 <Output directory="bin/Debug" assembly="Do.Universe" />
5 <Build debugmode="True" target="Library" />5 <Build debugmode="True" target="Library" />
6 <Execution runwithwarnings="True" consolepause="False" runtime="MsNet" clr-version="Net_2_0" />6 <Execution runwithwarnings="True" consolepause="False" runtime="MsNet" clr-version="Net_2_0" />
7 <CodeGeneration compiler="Mcs" warninglevel="4" optimize="False" unsafecodeallowed="False" generateoverflowchecks="False" definesymbols="DEBUG" generatexmldocumentation="False" ctype="CSharpCompilerParameters" />7 <CodeGeneration compiler="Mcs" warninglevel="4" optimize="True" unsafecodeallowed="False" generateoverflowchecks="True" definesymbols="DEBUG" generatexmldocumentation="False" ctype="CSharpCompilerParameters" />
8 </Configuration>8 </Configuration>
9 <Configuration name="Release" ctype="DotNetProjectConfiguration">9 <Configuration name="Release" ctype="DotNetProjectConfiguration">
10 <Output directory="bin/Release" assembly="Do.Universe" />10 <Output directory="bin/Release" assembly="Do.Universe" />
@@ -49,6 +49,5 @@
49 <ProjectReference type="Gac" localcopy="True" refto="System.Core, Version=3.5.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />49 <ProjectReference type="Gac" localcopy="True" refto="System.Core, Version=3.5.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
50 <ProjectReference type="Gac" localcopy="True" refto="gtk-sharp, Version=2.12.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f" />50 <ProjectReference type="Gac" localcopy="True" refto="gtk-sharp, Version=2.12.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f" />
51 <ProjectReference type="Gac" localcopy="True" refto="gdk-sharp, Version=2.12.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f" />51 <ProjectReference type="Gac" localcopy="True" refto="gdk-sharp, Version=2.12.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f" />
52 <ProjectReference type="Gac" localcopy="True" refto="Do.Platform, Version=0.8.0.0, Culture=neutral, PublicKeyToken=null" />
53 </References>52 </References>
54</Project>53</Project>
55\ No newline at end of file54\ No newline at end of file
5655
=== modified file 'Do.mds'
--- Do.mds 2009-03-31 17:48:02 +0000
+++ Do.mds 2009-04-19 22:16:43 +0000
@@ -14,6 +14,7 @@
14 <Entry build="True" name="Do.Interface.Linux.Mini" configuration="Debug" />14 <Entry build="True" name="Do.Interface.Linux.Mini" configuration="Debug" />
15 <Entry build="True" name="Do.Interface.Linux.HUD" configuration="Debug" />15 <Entry build="True" name="Do.Interface.Linux.HUD" configuration="Debug" />
16 <Entry build="True" name="Do.Interface.Wink" configuration="Debug" />16 <Entry build="True" name="Do.Interface.Wink" configuration="Debug" />
17 <Entry build="True" name="Do.Interface.Linux.AnimationBase" configuration="Debug" />
17 </Configuration>18 </Configuration>
18 <Configuration name="Release" ctype="CombineConfiguration">19 <Configuration name="Release" ctype="CombineConfiguration">
19 <Entry build="True" name="Do" configuration="Release" />20 <Entry build="True" name="Do" configuration="Release" />
@@ -29,6 +30,7 @@
29 <Entry build="True" name="Do.Interface.Linux.Mini" configuration="Release" />30 <Entry build="True" name="Do.Interface.Linux.Mini" configuration="Release" />
30 <Entry build="True" name="Do.Interface.Linux.HUD" configuration="Release" />31 <Entry build="True" name="Do.Interface.Linux.HUD" configuration="Release" />
31 <Entry build="True" name="Do.Interface.Wink" configuration="Release" />32 <Entry build="True" name="Do.Interface.Wink" configuration="Release" />
33 <Entry build="True" name="Do.Interface.Linux.AnimationBase" configuration="Release" />
32 <CustomCommands>34 <CustomCommands>
33 <Command type="BeforeBuild" command="autogen.sh --enable-release=YES" workingdir="${CombineDir}" />35 <Command type="BeforeBuild" command="autogen.sh --enable-release=YES" workingdir="${CombineDir}" />
34 </CustomCommands>36 </CustomCommands>
@@ -48,6 +50,7 @@
48 <Execute type="None" entry="Do.Interface.Linux.Mini" />50 <Execute type="None" entry="Do.Interface.Linux.Mini" />
49 <Execute type="None" entry="Do.Interface.Linux.HUD" />51 <Execute type="None" entry="Do.Interface.Linux.HUD" />
50 <Execute type="None" entry="Do.Interface.Wink" />52 <Execute type="None" entry="Do.Interface.Wink" />
53 <Execute type="None" entry="Do.Interface.Linux.AnimationBase" />
51 </StartMode>54 </StartMode>
52 <Entries>55 <Entries>
53 <Entry filename="Do/Do.mdp" />56 <Entry filename="Do/Do.mdp" />
@@ -63,5 +66,6 @@
63 <Entry filename="Do.Interface.Linux.Mini/Do.Interface.Linux.Mini.mdp" />66 <Entry filename="Do.Interface.Linux.Mini/Do.Interface.Linux.Mini.mdp" />
64 <Entry filename="Do.Interface.Linux.HUD/Do.Interface.Linux.HUD.mdp" />67 <Entry filename="Do.Interface.Linux.HUD/Do.Interface.Linux.HUD.mdp" />
65 <Entry filename="Do.Interface.Wink/Do.Interface.Wink.mdp" />68 <Entry filename="Do.Interface.Wink/Do.Interface.Wink.mdp" />
69 <Entry filename="Do.Interface.Linux.AnimationBase/Do.Interface.Linux.AnimationBase.mdp" />
66 </Entries>70 </Entries>
67</Combine>71</Combine>
68\ No newline at end of file72\ No newline at end of file
6973
=== modified file 'Do/Do.mdp'
--- Do/Do.mdp 2009-04-18 03:12:46 +0000
+++ Do/Do.mdp 2009-04-20 00:12:53 +0000
@@ -1,17 +1,17 @@
1<Project name="Do" fileversion="2.0" language="C#" clr-version="Net_2_0" targetFramework="2.0" ctype="DotNetProject">1<Project name="Do" fileversion="2.0" language="C#" clr-version="Net_2_0" targetFramework="3.5" ctype="DotNetProject">
2 <Configurations active="Debug">2 <Configurations active="Debug">
3 <Configuration name="Debug" ctype="DotNetProjectConfiguration">3 <Configuration name="Debug" ctype="DotNetProjectConfiguration">
4 <Output directory="bin/Debug" assemblyKeyFile="." assembly="Do" />4 <Output directory="bin/Debug" assemblyKeyFile="." assembly="Do" />
5 <Build debugmode="True" target="Exe" />5 <Build debugmode="True" target="Exe" />
6 <Execution runwithwarnings="True" commandlineparameters="--debug" externalconsole="True" consolepause="True" runtime="MsNet" clr-version="Net_2_0" />6 <Execution runwithwarnings="True" commandlineparameters="--debug" externalconsole="True" consolepause="True" runtime="MsNet" clr-version="Net_2_0" />
7 <EnvironmentVariables />7 <EnvironmentVariables />
8 <CodeGeneration compiler="Mcs" warninglevel="4" optimize="True" unsafecodeallowed="False" generateoverflowchecks="True" generatexmldocumentation="False" ctype="CSharpCompilerParameters" />8 <CodeGeneration compiler="Mcs" warninglevel="4" optimize="True" unsafecodeallowed="True" generateoverflowchecks="True" generatexmldocumentation="False" ctype="CSharpCompilerParameters" />
9 </Configuration>9 </Configuration>
10 <Configuration name="Release" ctype="DotNetProjectConfiguration">10 <Configuration name="Release" ctype="DotNetProjectConfiguration">
11 <Output directory="bin/Release" assembly="Do" />11 <Output directory="bin/Release" assembly="Do" />
12 <Build debugmode="False" target="Exe" />12 <Build debugmode="False" target="Exe" />
13 <Execution runwithwarnings="True" consolepause="True" runtime="MsNet" clr-version="Net_2_0" />13 <Execution runwithwarnings="True" consolepause="True" runtime="MsNet" clr-version="Net_2_0" />
14 <CodeGeneration compiler="Mcs" warninglevel="4" optimize="True" unsafecodeallowed="False" generateoverflowchecks="True" generatexmldocumentation="False" ctype="CSharpCompilerParameters" />14 <CodeGeneration compiler="Mcs" warninglevel="4" optimize="True" unsafecodeallowed="True" generateoverflowchecks="True" generatexmldocumentation="False" ctype="CSharpCompilerParameters" />
15 </Configuration>15 </Configuration>
16 </Configurations>16 </Configurations>
17 <Contents>17 <Contents>
@@ -86,6 +86,9 @@
86 <File name="src/Do.Core/Do.Core.Addins/CommunityAddinClassifier.cs" subtype="Code" buildaction="Compile" />86 <File name="src/Do.Core/Do.Core.Addins/CommunityAddinClassifier.cs" subtype="Code" buildaction="Compile" />
87 <File name="src/Do.UI/SearchEntry.cs" subtype="Code" buildaction="Compile" />87 <File name="src/Do.UI/SearchEntry.cs" subtype="Code" buildaction="Compile" />
88 <File name="src/Do.UI/HoverImageButton.cs" subtype="Code" buildaction="Compile" />88 <File name="src/Do.UI/HoverImageButton.cs" subtype="Code" buildaction="Compile" />
89 <File name="src/CoreKeybindings.cs" subtype="Code" buildaction="Compile" />
90 <File name="src/Do.Core/Shortcut.cs" subtype="Code" buildaction="Compile" />
91 <File name="src/Do.Core/ShortcutCallback.cs" subtype="Code" buildaction="Compile" />
89 </Contents>92 </Contents>
90 <References>93 <References>
91 <ProjectReference type="Gac" localcopy="True" refto="System, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />94 <ProjectReference type="Gac" localcopy="True" refto="System, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
@@ -101,6 +104,7 @@
101 <ProjectReference type="Project" localcopy="True" refto="Do.Interface.Linux" />104 <ProjectReference type="Project" localcopy="True" refto="Do.Interface.Linux" />
102 <ProjectReference type="Project" localcopy="True" refto="Do.Universe" />105 <ProjectReference type="Project" localcopy="True" refto="Do.Universe" />
103 <ProjectReference type="Gac" localcopy="True" refto="glib-sharp, Version=2.12.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f" />106 <ProjectReference type="Gac" localcopy="True" refto="glib-sharp, Version=2.12.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f" />
107 <ProjectReference type="Project" localcopy="True" refto="Do.Interface.Linux.AnimationBase" />
104 </References>108 </References>
105 <LanguageParameters ApplicationIcon="../../../../../jason/do/trunk-merge/Do" ctype="CSharpProjectParameters" />109 <LanguageParameters ApplicationIcon="../../../../../jason/do/trunk-merge/Do" ctype="CSharpProjectParameters" />
106 <Deployment.LinuxDeployData scriptName="gnome-do" />110 <Deployment.LinuxDeployData scriptName="gnome-do" />
107111
=== modified file 'Do/Makefile.am'
--- Do/Makefile.am 2009-03-22 05:41:46 +0000
+++ Do/Makefile.am 2009-04-20 00:12:53 +0000
@@ -94,7 +94,8 @@
94 Do.Universe \94 Do.Universe \
95 Do.Platform \95 Do.Platform \
96 Do.Platform.Linux \96 Do.Platform.Linux \
97 Do.Interface.Linux97 Do.Interface.Linux \
98 Do.Interface.Linux.AnimationBase
9899
99#100#
100# Extra rules for our binary, not worth factoring out101# Extra rules for our binary, not worth factoring out
101102
=== modified file 'Do/gtk-gui/Do.UI.ColorConfigurationWidget.cs'
--- Do/gtk-gui/Do.UI.ColorConfigurationWidget.cs 2009-02-06 21:55:49 +0000
+++ Do/gtk-gui/Do.UI.ColorConfigurationWidget.cs 2009-04-21 02:15:39 +0000
@@ -23,22 +23,12 @@
23 23
24 private Gtk.VBox vbox1;24 private Gtk.VBox vbox1;
25 25
26 private Gtk.Alignment alignment1;26 private Gtk.HBox hbox4;
27 27
28 private Gtk.Table table1;28 private Gtk.Label theme_lbl;
29
30 private Gtk.HBox hbox3;
31
32 private Gtk.ColorButton background_colorbutton;
33
34 private Gtk.Button clear_background;
35
36 private Gtk.Label label8;
37 29
38 private Gtk.ComboBox theme_combo;30 private Gtk.ComboBox theme_combo;
39 31
40 private Gtk.Label theme_lbl;
41
42 private Gtk.VBox vbox3;32 private Gtk.VBox vbox3;
43 33
44 private Gtk.VBox vbox4;34 private Gtk.VBox vbox4;
@@ -47,9 +37,9 @@
47 37
48 private Gtk.CheckButton pin_check;38 private Gtk.CheckButton pin_check;
49 39
50 private Gtk.CheckButton shadow_check;40 private Gtk.Alignment theme_configuration_container;
51 41
52 private Gtk.CheckButton animation_check;42 private Gtk.HSeparator hseparator1;
53 43
54 private Gtk.VBox composite_warning_widget;44 private Gtk.VBox composite_warning_widget;
55 45
@@ -87,98 +77,33 @@
87 this.vbox1.Name = "vbox1";77 this.vbox1.Name = "vbox1";
88 this.vbox1.Spacing = 6;78 this.vbox1.Spacing = 6;
89 // Container child vbox1.Gtk.Box+BoxChild79 // Container child vbox1.Gtk.Box+BoxChild
90 this.alignment1 = new Gtk.Alignment(0.5F, 0.5F, 1F, 1F);80 this.hbox4 = new Gtk.HBox();
91 this.alignment1.Name = "alignment1";81 this.hbox4.Name = "hbox4";
92 // Container child alignment1.Gtk.Container+ContainerChild82 this.hbox4.Spacing = 6;
93 this.table1 = new Gtk.Table(((uint)(2)), ((uint)(3)), false);83 // Container child hbox4.Gtk.Box+BoxChild
94 this.table1.Name = "table1";
95 this.table1.RowSpacing = ((uint)(6));
96 this.table1.ColumnSpacing = ((uint)(16));
97 // Container child table1.Gtk.Table+TableChild
98 this.hbox3 = new Gtk.HBox();
99 this.hbox3.Name = "hbox3";
100 this.hbox3.Spacing = 6;
101 // Container child hbox3.Gtk.Box+BoxChild
102 this.background_colorbutton = new Gtk.ColorButton();
103 this.background_colorbutton.CanFocus = true;
104 this.background_colorbutton.Events = ((Gdk.EventMask)(784));
105 this.background_colorbutton.Name = "background_colorbutton";
106 this.background_colorbutton.UseAlpha = true;
107 this.background_colorbutton.Alpha = 65535;
108 this.hbox3.Add(this.background_colorbutton);
109 Gtk.Box.BoxChild w1 = ((Gtk.Box.BoxChild)(this.hbox3[this.background_colorbutton]));
110 w1.Position = 0;
111 // Container child hbox3.Gtk.Box+BoxChild
112 this.clear_background = new Gtk.Button();
113 this.clear_background.CanFocus = true;
114 this.clear_background.Name = "clear_background";
115 this.clear_background.UseUnderline = true;
116 this.clear_background.Relief = ((Gtk.ReliefStyle)(2));
117 // Container child clear_background.Gtk.Container+ContainerChild
118 Gtk.Alignment w2 = new Gtk.Alignment(0.5F, 0.5F, 0F, 0F);
119 // Container child GtkAlignment.Gtk.Container+ContainerChild
120 Gtk.HBox w3 = new Gtk.HBox();
121 w3.Spacing = 2;
122 // Container child GtkHBox.Gtk.Container+ContainerChild
123 Gtk.Image w4 = new Gtk.Image();
124 w4.Pixbuf = Stetic.IconLoader.LoadIcon(this, "gtk-clear", Gtk.IconSize.Menu, 16);
125 w3.Add(w4);
126 // Container child GtkHBox.Gtk.Container+ContainerChild
127 Gtk.Label w6 = new Gtk.Label();
128 w6.LabelProp = Mono.Unix.Catalog.GetString("_Reset");
129 w6.UseUnderline = true;
130 w3.Add(w6);
131 w2.Add(w3);
132 this.clear_background.Add(w2);
133 this.hbox3.Add(this.clear_background);
134 Gtk.Box.BoxChild w10 = ((Gtk.Box.BoxChild)(this.hbox3[this.clear_background]));
135 w10.Position = 1;
136 w10.Expand = false;
137 w10.Fill = false;
138 this.table1.Add(this.hbox3);
139 Gtk.Table.TableChild w11 = ((Gtk.Table.TableChild)(this.table1[this.hbox3]));
140 w11.TopAttach = ((uint)(1));
141 w11.BottomAttach = ((uint)(2));
142 w11.LeftAttach = ((uint)(1));
143 w11.RightAttach = ((uint)(2));
144 w11.XOptions = ((Gtk.AttachOptions)(4));
145 w11.YOptions = ((Gtk.AttachOptions)(4));
146 // Container child table1.Gtk.Table+TableChild
147 this.label8 = new Gtk.Label();
148 this.label8.Name = "label8";
149 this.label8.Xalign = 0F;
150 this.label8.LabelProp = Mono.Unix.Catalog.GetString("Background Color:");
151 this.table1.Add(this.label8);
152 Gtk.Table.TableChild w12 = ((Gtk.Table.TableChild)(this.table1[this.label8]));
153 w12.TopAttach = ((uint)(1));
154 w12.BottomAttach = ((uint)(2));
155 w12.XOptions = ((Gtk.AttachOptions)(4));
156 w12.YOptions = ((Gtk.AttachOptions)(4));
157 // Container child table1.Gtk.Table+TableChild
158 this.theme_combo = Gtk.ComboBox.NewText();
159 this.theme_combo.Name = "theme_combo";
160 this.table1.Add(this.theme_combo);
161 Gtk.Table.TableChild w13 = ((Gtk.Table.TableChild)(this.table1[this.theme_combo]));
162 w13.LeftAttach = ((uint)(1));
163 w13.RightAttach = ((uint)(2));
164 w13.XOptions = ((Gtk.AttachOptions)(4));
165 w13.YOptions = ((Gtk.AttachOptions)(4));
166 // Container child table1.Gtk.Table+TableChild
167 this.theme_lbl = new Gtk.Label();84 this.theme_lbl = new Gtk.Label();
168 this.theme_lbl.Name = "theme_lbl";85 this.theme_lbl.Name = "theme_lbl";
169 this.theme_lbl.Xalign = 0F;86 this.theme_lbl.Xalign = 0F;
170 this.theme_lbl.LabelProp = Mono.Unix.Catalog.GetString("_Theme:");87 this.theme_lbl.LabelProp = Mono.Unix.Catalog.GetString("_Theme:");
171 this.theme_lbl.UseUnderline = true;88 this.theme_lbl.UseUnderline = true;
172 this.table1.Add(this.theme_lbl);89 this.hbox4.Add(this.theme_lbl);
173 Gtk.Table.TableChild w14 = ((Gtk.Table.TableChild)(this.table1[this.theme_lbl]));90 Gtk.Box.BoxChild w1 = ((Gtk.Box.BoxChild)(this.hbox4[this.theme_lbl]));
174 w14.XOptions = ((Gtk.AttachOptions)(4));91 w1.Position = 0;
175 w14.YOptions = ((Gtk.AttachOptions)(4));92 w1.Expand = false;
176 this.alignment1.Add(this.table1);93 w1.Fill = false;
177 this.vbox1.Add(this.alignment1);94 // Container child hbox4.Gtk.Box+BoxChild
178 Gtk.Box.BoxChild w16 = ((Gtk.Box.BoxChild)(this.vbox1[this.alignment1]));95 this.theme_combo = Gtk.ComboBox.NewText();
179 w16.Position = 0;96 this.theme_combo.Name = "theme_combo";
180 w16.Expand = false;97 this.hbox4.Add(this.theme_combo);
181 w16.Fill = false;98 Gtk.Box.BoxChild w2 = ((Gtk.Box.BoxChild)(this.hbox4[this.theme_combo]));
99 w2.Position = 1;
100 w2.Expand = false;
101 w2.Fill = false;
102 this.vbox1.Add(this.hbox4);
103 Gtk.Box.BoxChild w3 = ((Gtk.Box.BoxChild)(this.vbox1[this.hbox4]));
104 w3.Position = 0;
105 w3.Expand = false;
106 w3.Fill = false;
182 // Container child vbox1.Gtk.Box+BoxChild107 // Container child vbox1.Gtk.Box+BoxChild
183 this.vbox3 = new Gtk.VBox();108 this.vbox3 = new Gtk.VBox();
184 this.vbox3.Name = "vbox3";109 this.vbox3.Name = "vbox3";
@@ -201,56 +126,50 @@
201 this.pin_check.DrawIndicator = true;126 this.pin_check.DrawIndicator = true;
202 this.pin_check.UseUnderline = true;127 this.pin_check.UseUnderline = true;
203 this.hbox2.Add(this.pin_check);128 this.hbox2.Add(this.pin_check);
204 Gtk.Box.BoxChild w17 = ((Gtk.Box.BoxChild)(this.hbox2[this.pin_check]));129 Gtk.Box.BoxChild w4 = ((Gtk.Box.BoxChild)(this.hbox2[this.pin_check]));
205 w17.Position = 0;130 w4.Position = 0;
206 this.vbox4.Add(this.hbox2);131 this.vbox4.Add(this.hbox2);
207 Gtk.Box.BoxChild w18 = ((Gtk.Box.BoxChild)(this.vbox4[this.hbox2]));132 Gtk.Box.BoxChild w5 = ((Gtk.Box.BoxChild)(this.vbox4[this.hbox2]));
208 w18.Position = 0;133 w5.Position = 0;
209 w18.Expand = false;134 w5.Expand = false;
210 w18.Fill = false;135 w5.Fill = false;
211 // Container child vbox4.Gtk.Box+BoxChild
212 this.shadow_check = new Gtk.CheckButton();
213 this.shadow_check.CanFocus = true;
214 this.shadow_check.Name = "shadow_check";
215 this.shadow_check.Label = Mono.Unix.Catalog.GetString("Show window shadow");
216 this.shadow_check.DrawIndicator = true;
217 this.shadow_check.UseUnderline = true;
218 this.vbox4.Add(this.shadow_check);
219 Gtk.Box.BoxChild w19 = ((Gtk.Box.BoxChild)(this.vbox4[this.shadow_check]));
220 w19.Position = 1;
221 w19.Expand = false;
222 w19.Fill = false;
223 // Container child vbox4.Gtk.Box+BoxChild
224 this.animation_check = new Gtk.CheckButton();
225 this.animation_check.CanFocus = true;
226 this.animation_check.Name = "animation_check";
227 this.animation_check.Label = Mono.Unix.Catalog.GetString("Animate window");
228 this.animation_check.Active = true;
229 this.animation_check.DrawIndicator = true;
230 this.animation_check.UseUnderline = true;
231 this.vbox4.Add(this.animation_check);
232 Gtk.Box.BoxChild w20 = ((Gtk.Box.BoxChild)(this.vbox4[this.animation_check]));
233 w20.Position = 2;
234 w20.Expand = false;
235 w20.Fill = false;
236 this.vbox3.Add(this.vbox4);136 this.vbox3.Add(this.vbox4);
237 Gtk.Box.BoxChild w21 = ((Gtk.Box.BoxChild)(this.vbox3[this.vbox4]));137 Gtk.Box.BoxChild w6 = ((Gtk.Box.BoxChild)(this.vbox3[this.vbox4]));
238 w21.Position = 0;138 w6.Position = 0;
239 w21.Expand = false;139 w6.Expand = false;
240 w21.Fill = false;140 w6.Fill = false;
241 this.vbox1.Add(this.vbox3);141 this.vbox1.Add(this.vbox3);
242 Gtk.Box.BoxChild w22 = ((Gtk.Box.BoxChild)(this.vbox1[this.vbox3]));142 Gtk.Box.BoxChild w7 = ((Gtk.Box.BoxChild)(this.vbox1[this.vbox3]));
243 w22.Position = 1;143 w7.Position = 1;
244 w22.Expand = false;144 w7.Expand = false;
245 w22.Fill = false;145 w7.Fill = false;
246 this.alignment2.Add(this.vbox1);146 this.alignment2.Add(this.vbox1);
247 this.GtkAlignment.Add(this.alignment2);147 this.GtkAlignment.Add(this.alignment2);
248 this.frame1.Add(this.GtkAlignment);148 this.frame1.Add(this.GtkAlignment);
249 this.vbox2.Add(this.frame1);149 this.vbox2.Add(this.frame1);
250 Gtk.Box.BoxChild w26 = ((Gtk.Box.BoxChild)(this.vbox2[this.frame1]));150 Gtk.Box.BoxChild w11 = ((Gtk.Box.BoxChild)(this.vbox2[this.frame1]));
251 w26.Position = 0;151 w11.Position = 0;
252 w26.Expand = false;152 w11.Expand = false;
253 w26.Fill = false;153 w11.Fill = false;
154 // Container child vbox2.Gtk.Box+BoxChild
155 this.theme_configuration_container = new Gtk.Alignment(0.5F, 0.5F, 1F, 1F);
156 this.theme_configuration_container.Name = "theme_configuration_container";
157 this.theme_configuration_container.LeftPadding = ((uint)(6));
158 this.theme_configuration_container.RightPadding = ((uint)(6));
159 this.theme_configuration_container.BottomPadding = ((uint)(3));
160 this.vbox2.Add(this.theme_configuration_container);
161 Gtk.Box.BoxChild w12 = ((Gtk.Box.BoxChild)(this.vbox2[this.theme_configuration_container]));
162 w12.PackType = ((Gtk.PackType)(1));
163 w12.Position = 1;
164 // Container child vbox2.Gtk.Box+BoxChild
165 this.hseparator1 = new Gtk.HSeparator();
166 this.hseparator1.Name = "hseparator1";
167 this.vbox2.Add(this.hseparator1);
168 Gtk.Box.BoxChild w13 = ((Gtk.Box.BoxChild)(this.vbox2[this.hseparator1]));
169 w13.PackType = ((Gtk.PackType)(1));
170 w13.Position = 2;
171 w13.Expand = false;
172 w13.Fill = false;
254 // Container child vbox2.Gtk.Box+BoxChild173 // Container child vbox2.Gtk.Box+BoxChild
255 this.composite_warning_widget = new Gtk.VBox();174 this.composite_warning_widget = new Gtk.VBox();
256 this.composite_warning_widget.Name = "composite_warning_widget";175 this.composite_warning_widget.Name = "composite_warning_widget";
@@ -262,10 +181,10 @@
262 this.label1.UseMarkup = true;181 this.label1.UseMarkup = true;
263 this.label1.Wrap = true;182 this.label1.Wrap = true;
264 this.composite_warning_widget.Add(this.label1);183 this.composite_warning_widget.Add(this.label1);
265 Gtk.Box.BoxChild w27 = ((Gtk.Box.BoxChild)(this.composite_warning_widget[this.label1]));184 Gtk.Box.BoxChild w14 = ((Gtk.Box.BoxChild)(this.composite_warning_widget[this.label1]));
266 w27.Position = 0;185 w14.Position = 0;
267 w27.Expand = false;186 w14.Expand = false;
268 w27.Fill = false;187 w14.Fill = false;
269 // Container child composite_warning_widget.Gtk.Box+BoxChild188 // Container child composite_warning_widget.Gtk.Box+BoxChild
270 this.hbuttonbox1 = new Gtk.HButtonBox();189 this.hbuttonbox1 = new Gtk.HButtonBox();
271 this.hbuttonbox1.LayoutStyle = ((Gtk.ButtonBoxStyle)(4));190 this.hbuttonbox1.LayoutStyle = ((Gtk.ButtonBoxStyle)(4));
@@ -277,18 +196,20 @@
277 this.composite_warning_info_btn.UseUnderline = true;196 this.composite_warning_info_btn.UseUnderline = true;
278 this.composite_warning_info_btn.Label = "gtk-dialog-info";197 this.composite_warning_info_btn.Label = "gtk-dialog-info";
279 this.hbuttonbox1.Add(this.composite_warning_info_btn);198 this.hbuttonbox1.Add(this.composite_warning_info_btn);
280 Gtk.ButtonBox.ButtonBoxChild w28 = ((Gtk.ButtonBox.ButtonBoxChild)(this.hbuttonbox1[this.composite_warning_info_btn]));199 Gtk.ButtonBox.ButtonBoxChild w15 = ((Gtk.ButtonBox.ButtonBoxChild)(this.hbuttonbox1[this.composite_warning_info_btn]));
281 w28.Expand = false;200 w15.Expand = false;
282 w28.Fill = false;201 w15.Fill = false;
283 this.composite_warning_widget.Add(this.hbuttonbox1);202 this.composite_warning_widget.Add(this.hbuttonbox1);
284 Gtk.Box.BoxChild w29 = ((Gtk.Box.BoxChild)(this.composite_warning_widget[this.hbuttonbox1]));203 Gtk.Box.BoxChild w16 = ((Gtk.Box.BoxChild)(this.composite_warning_widget[this.hbuttonbox1]));
285 w29.Position = 1;204 w16.Position = 1;
286 w29.Expand = false;205 w16.Expand = false;
287 w29.Fill = false;206 w16.Fill = false;
288 this.vbox2.Add(this.composite_warning_widget);207 this.vbox2.Add(this.composite_warning_widget);
289 Gtk.Box.BoxChild w30 = ((Gtk.Box.BoxChild)(this.vbox2[this.composite_warning_widget]));208 Gtk.Box.BoxChild w17 = ((Gtk.Box.BoxChild)(this.vbox2[this.composite_warning_widget]));
290 w30.PackType = ((Gtk.PackType)(1));209 w17.PackType = ((Gtk.PackType)(1));
291 w30.Position = 1;210 w17.Position = 3;
211 w17.Expand = false;
212 w17.Fill = false;
292 this.Add(this.vbox2);213 this.Add(this.vbox2);
293 if ((this.Child != null)) {214 if ((this.Child != null)) {
294 this.Child.ShowAll();215 this.Child.ShowAll();
@@ -297,11 +218,7 @@
297 this.composite_warning_widget.Hide();218 this.composite_warning_widget.Hide();
298 this.Show();219 this.Show();
299 this.theme_combo.Changed += new System.EventHandler(this.OnThemeComboChanged);220 this.theme_combo.Changed += new System.EventHandler(this.OnThemeComboChanged);
300 this.background_colorbutton.ColorSet += new System.EventHandler(this.OnBackgroundColorbuttonColorSet);
301 this.clear_background.Clicked += new System.EventHandler(this.OnClearBackgroundClicked);
302 this.pin_check.Clicked += new System.EventHandler(this.OnPinCheckClicked);221 this.pin_check.Clicked += new System.EventHandler(this.OnPinCheckClicked);
303 this.shadow_check.Clicked += new System.EventHandler(this.OnShadowCheckClicked);
304 this.animation_check.Clicked += new System.EventHandler(this.OnAnimationCheckbuttonClicked);
305 this.composite_warning_info_btn.Clicked += new System.EventHandler(this.OnCompositeWarningInfoBtnClicked);222 this.composite_warning_info_btn.Clicked += new System.EventHandler(this.OnCompositeWarningInfoBtnClicked);
306 }223 }
307 }224 }
308225
=== modified file 'Do/gtk-gui/gui.stetic'
--- Do/gtk-gui/gui.stetic 2009-03-06 07:14:21 +0000
+++ Do/gtk-gui/gui.stetic 2009-04-21 02:15:39 +0000
@@ -6,7 +6,10 @@
6 </configuration>6 </configuration>
7 <import>7 <import>
8 <widget-library name="Mono.Addins.Gui, Version=0.3.0.0, Culture=neutral, PublicKeyToken=0738eb9f132ed756" />8 <widget-library name="Mono.Addins.Gui, Version=0.3.0.0, Culture=neutral, PublicKeyToken=0738eb9f132ed756" />
9 <widget-library name="../../Do.Platform.Linux/bin/Debug/Do.Platform.Linux.dll" />
10 <widget-library name="../../Do.Interface.Linux/bin/Debug/Do.Interface.Linux.dll" />
9 <widget-library name="../bin/Debug/Do.exe" internal="true" />11 <widget-library name="../bin/Debug/Do.exe" internal="true" />
12 <widget-library name="../../Do.Interface.Linux.AnimationBase/bin/Debug/Do.Interface.Linux.AnimationBase.dll" />
10 </import>13 </import>
11 <widget class="Gtk.Window" id="Do.UI.PreferencesWindow" design-size="450 470">14 <widget class="Gtk.Window" id="Do.UI.PreferencesWindow" design-size="450 470">
12 <property name="MemberName" />15 <property name="MemberName" />
@@ -702,134 +705,36 @@
702 <property name="MemberName" />705 <property name="MemberName" />
703 <property name="Spacing">6</property>706 <property name="Spacing">6</property>
704 <child>707 <child>
705 <widget class="Gtk.Alignment" id="alignment1">708 <widget class="Gtk.HBox" id="hbox4">
706 <property name="MemberName" />709 <property name="MemberName" />
707 <child>710 <property name="Spacing">6</property>
708 <widget class="Gtk.Table" id="table1">711 <child>
709 <property name="MemberName" />712 <widget class="Gtk.Label" id="theme_lbl">
710 <property name="NRows">2</property>713 <property name="MemberName" />
711 <property name="RowSpacing">6</property>714 <property name="Xalign">0</property>
712 <property name="ColumnSpacing">16</property>715 <property name="LabelProp" translatable="yes">_Theme:</property>
713 <child>716 <property name="UseUnderline">True</property>
714 <placeholder />717 </widget>
715 </child>718 <packing>
716 <child>719 <property name="Position">0</property>
717 <placeholder />720 <property name="AutoSize">True</property>
718 </child>721 <property name="Expand">False</property>
719 <child>722 <property name="Fill">False</property>
720 <widget class="Gtk.HBox" id="hbox3">723 </packing>
721 <property name="MemberName" />724 </child>
722 <property name="Spacing">6</property>725 <child>
723 <child>726 <widget class="Gtk.ComboBox" id="theme_combo">
724 <widget class="Gtk.ColorButton" id="background_colorbutton">727 <property name="MemberName" />
725 <property name="MemberName" />728 <property name="IsTextCombo">True</property>
726 <property name="CanFocus">True</property>729 <property name="Items" translatable="yes" />
727 <property name="Events">ButtonMotionMask, ButtonPressMask, ButtonReleaseMask</property>730 <signal name="Changed" handler="OnThemeComboChanged" />
728 <property name="UseAlpha">True</property>731 </widget>
729 <property name="Alpha">65535</property>732 <packing>
730 <signal name="ColorSet" handler="OnBackgroundColorbuttonColorSet" />733 <property name="Position">1</property>
731 </widget>734 <property name="AutoSize">True</property>
732 <packing>735 <property name="Expand">False</property>
733 <property name="Position">0</property>736 <property name="Fill">False</property>
734 <property name="AutoSize">False</property>737 </packing>
735 </packing>
736 </child>
737 <child>
738 <widget class="Gtk.Button" id="clear_background">
739 <property name="MemberName" />
740 <property name="CanFocus">True</property>
741 <property name="Type">TextAndIcon</property>
742 <property name="Icon">stock:gtk-clear Menu</property>
743 <property name="Label" translatable="yes">_Reset</property>
744 <property name="UseUnderline">True</property>
745 <property name="Relief">None</property>
746 <signal name="Clicked" handler="OnClearBackgroundClicked" />
747 </widget>
748 <packing>
749 <property name="Position">1</property>
750 <property name="AutoSize">True</property>
751 <property name="Expand">False</property>
752 <property name="Fill">False</property>
753 </packing>
754 </child>
755 </widget>
756 <packing>
757 <property name="TopAttach">1</property>
758 <property name="BottomAttach">2</property>
759 <property name="LeftAttach">1</property>
760 <property name="RightAttach">2</property>
761 <property name="AutoSize">True</property>
762 <property name="XOptions">Fill</property>
763 <property name="YOptions">Fill</property>
764 <property name="XExpand">False</property>
765 <property name="XFill">True</property>
766 <property name="XShrink">False</property>
767 <property name="YExpand">False</property>
768 <property name="YFill">True</property>
769 <property name="YShrink">False</property>
770 </packing>
771 </child>
772 <child>
773 <widget class="Gtk.Label" id="label8">
774 <property name="MemberName" />
775 <property name="Xalign">0</property>
776 <property name="LabelProp" translatable="yes">Background Color:</property>
777 </widget>
778 <packing>
779 <property name="TopAttach">1</property>
780 <property name="BottomAttach">2</property>
781 <property name="AutoSize">True</property>
782 <property name="XOptions">Fill</property>
783 <property name="YOptions">Fill</property>
784 <property name="XExpand">False</property>
785 <property name="XFill">True</property>
786 <property name="XShrink">False</property>
787 <property name="YExpand">False</property>
788 <property name="YFill">True</property>
789 <property name="YShrink">False</property>
790 </packing>
791 </child>
792 <child>
793 <widget class="Gtk.ComboBox" id="theme_combo">
794 <property name="MemberName" />
795 <property name="IsTextCombo">True</property>
796 <property name="Items" translatable="yes" />
797 <signal name="Changed" handler="OnThemeComboChanged" />
798 </widget>
799 <packing>
800 <property name="LeftAttach">1</property>
801 <property name="RightAttach">2</property>
802 <property name="AutoSize">True</property>
803 <property name="XOptions">Fill</property>
804 <property name="YOptions">Fill</property>
805 <property name="XExpand">False</property>
806 <property name="XFill">True</property>
807 <property name="XShrink">False</property>
808 <property name="YExpand">False</property>
809 <property name="YFill">True</property>
810 <property name="YShrink">False</property>
811 </packing>
812 </child>
813 <child>
814 <widget class="Gtk.Label" id="theme_lbl">
815 <property name="MemberName" />
816 <property name="Xalign">0</property>
817 <property name="LabelProp" translatable="yes">_Theme:</property>
818 <property name="UseUnderline">True</property>
819 </widget>
820 <packing>
821 <property name="AutoSize">True</property>
822 <property name="XOptions">Fill</property>
823 <property name="YOptions">Fill</property>
824 <property name="XExpand">False</property>
825 <property name="XFill">True</property>
826 <property name="XShrink">False</property>
827 <property name="YExpand">False</property>
828 <property name="YFill">True</property>
829 <property name="YShrink">False</property>
830 </packing>
831 </child>
832 </widget>
833 </child>738 </child>
834 </widget>739 </widget>
835 <packing>740 <packing>
@@ -876,41 +781,6 @@
876 <property name="Fill">False</property>781 <property name="Fill">False</property>
877 </packing>782 </packing>
878 </child>783 </child>
879 <child>
880 <widget class="Gtk.CheckButton" id="shadow_check">
881 <property name="MemberName" />
882 <property name="CanFocus">True</property>
883 <property name="Label" translatable="yes">Show window shadow</property>
884 <property name="DrawIndicator">True</property>
885 <property name="HasLabel">True</property>
886 <property name="UseUnderline">True</property>
887 <signal name="Clicked" handler="OnShadowCheckClicked" />
888 </widget>
889 <packing>
890 <property name="Position">1</property>
891 <property name="AutoSize">True</property>
892 <property name="Expand">False</property>
893 <property name="Fill">False</property>
894 </packing>
895 </child>
896 <child>
897 <widget class="Gtk.CheckButton" id="animation_check">
898 <property name="MemberName" />
899 <property name="CanFocus">True</property>
900 <property name="Label" translatable="yes">Animate window</property>
901 <property name="Active">True</property>
902 <property name="DrawIndicator">True</property>
903 <property name="HasLabel">True</property>
904 <property name="UseUnderline">True</property>
905 <signal name="Clicked" handler="OnAnimationCheckbuttonClicked" />
906 </widget>
907 <packing>
908 <property name="Position">2</property>
909 <property name="AutoSize">True</property>
910 <property name="Expand">False</property>
911 <property name="Fill">False</property>
912 </packing>
913 </child>
914 </widget>784 </widget>
915 <packing>785 <packing>
916 <property name="Position">0</property>786 <property name="Position">0</property>
@@ -942,6 +812,34 @@
942 </packing>812 </packing>
943 </child>813 </child>
944 <child>814 <child>
815 <widget class="Gtk.Alignment" id="theme_configuration_container">
816 <property name="MemberName" />
817 <property name="LeftPadding">6</property>
818 <property name="RightPadding">6</property>
819 <property name="BottomPadding">3</property>
820 <child>
821 <placeholder />
822 </child>
823 </widget>
824 <packing>
825 <property name="PackType">End</property>
826 <property name="Position">1</property>
827 <property name="AutoSize">True</property>
828 </packing>
829 </child>
830 <child>
831 <widget class="Gtk.HSeparator" id="hseparator1">
832 <property name="MemberName" />
833 </widget>
834 <packing>
835 <property name="PackType">End</property>
836 <property name="Position">2</property>
837 <property name="AutoSize">True</property>
838 <property name="Expand">False</property>
839 <property name="Fill">False</property>
840 </packing>
841 </child>
842 <child>
945 <widget class="Gtk.VBox" id="composite_warning_widget">843 <widget class="Gtk.VBox" id="composite_warning_widget">
946 <property name="MemberName" />844 <property name="MemberName" />
947 <property name="Visible">False</property>845 <property name="Visible">False</property>
@@ -989,14 +887,13 @@
989 <property name="Fill">False</property>887 <property name="Fill">False</property>
990 </packing>888 </packing>
991 </child>889 </child>
992 <child>
993 <placeholder />
994 </child>
995 </widget>890 </widget>
996 <packing>891 <packing>
997 <property name="PackType">End</property>892 <property name="PackType">End</property>
998 <property name="Position">1</property>893 <property name="Position">3</property>
999 <property name="AutoSize">True</property>894 <property name="AutoSize">True</property>
895 <property name="Expand">False</property>
896 <property name="Fill">False</property>
1000 </packing>897 </packing>
1001 </child>898 </child>
1002 </widget>899 </widget>
1003900
=== modified file 'Do/gtk-gui/objects.xml'
--- Do/gtk-gui/objects.xml 2009-04-18 03:12:46 +0000
+++ Do/gtk-gui/objects.xml 2009-04-19 06:40:08 +0000
@@ -1,2 +1,14 @@
1<objects attr-sync="on">1<objects attr-sync="on">
2 <object type="Do.UI.KeybindingsPreferencesWidget" palette-category="Do" allow-children="false" base-type="Gtk.Bin">
3 <itemgroups />
4 <signals />
5 </object>
6 <object type="Do.UI.ManagePluginsPreferencesWidget" palette-category="Do" allow-children="false" base-type="Gtk.Bin">
7 <itemgroups />
8 <signals />
9 </object>
10 <object type="Do.UI.GeneralPreferencesWidget" palette-category="Do" allow-children="false" base-type="Gtk.Bin">
11 <itemgroups />
12 <signals />
13 </object>
2</objects>14</objects>
3\ No newline at end of file15\ No newline at end of file
416
=== modified file 'Do/src/Do.Core/Controller.cs'
--- Do/src/Do.Core/Controller.cs 2009-04-01 03:25:59 +0000
+++ Do/src/Do.Core/Controller.cs 2009-04-21 02:15:39 +0000
@@ -48,6 +48,12 @@
4848
49 public event EventHandler Summoned;49 public event EventHandler Summoned;
5050
51 internal IDoWindow Window {
52 get {
53 return window;
54 }
55 }
56
51 public Gtk.AboutDialog AboutDialog { get; private set; }57 public Gtk.AboutDialog AboutDialog { get; private set; }
52 public PreferencesWindow PreferencesWindow { get; private set; }58 public PreferencesWindow PreferencesWindow { get; private set; }
53 59
@@ -977,6 +983,7 @@
977 PreferencesWindow = new PreferencesWindow ();983 PreferencesWindow = new PreferencesWindow ();
978 PreferencesWindow.Hidden += delegate {984 PreferencesWindow.Hidden += delegate {
979 // Release the window.985 // Release the window.
986 PreferencesWindow.Dispose ();
980 PreferencesWindow.Destroy ();987 PreferencesWindow.Destroy ();
981 PreferencesWindow = null;988 PreferencesWindow = null;
982 // Reload universe.989 // Reload universe.
983990
=== modified file 'Do/src/Do.UI/ColorConfigurationWidget.cs'
--- Do/src/Do.UI/ColorConfigurationWidget.cs 2009-03-06 05:52:26 +0000
+++ Do/src/Do.UI/ColorConfigurationWidget.cs 2009-04-21 02:15:39 +0000
@@ -41,8 +41,6 @@
41 set { themes = value; }41 set { themes = value; }
42 }42 }
4343
44 bool setup = false;
45
46 public ColorConfigurationWidget ()44 public ColorConfigurationWidget ()
47 {45 {
48 Build ();46 Build ();
@@ -55,95 +53,23 @@
55 Themes.Add (theme.Name);53 Themes.Add (theme.Name);
56 }54 }
5755
58 SetupButtons ();
59 if (!Screen.IsComposited) {56 if (!Screen.IsComposited) {
60 composite_warning_widget.Visible = true;57 composite_warning_widget.Visible = true;
61 theme_combo.Sensitive = false;58 theme_combo.Sensitive = false;
62 animation_check.State = shadow_check.State = Gtk.StateType.Insensitive;
63 }59 }
64 60
65 // Setup theme combo61 // Setup theme combo
66 theme_combo.Active = Math.Max (0, Themes.IndexOf (Do.Preferences.Theme));62 theme_combo.Active = Math.Max (0, Themes.IndexOf (Do.Preferences.Theme));
67 pin_check.Active = Do.Preferences.AlwaysShowResults;63 pin_check.Active = Do.Preferences.AlwaysShowResults;
68 }64
69 65 theme_configuration_container.ShowAll ();
70 protected override void OnDestroyed ()66 }
71 {
72 base.OnDestroyed ();
73 }
74
75 private void DisableButtons ()
76 {
77 clear_background.Sensitive = false;
78 background_colorbutton.Sensitive = false;
79 shadow_check.Sensitive = false;
80 }
81
82 private void SetupButtons ()
83 {
84 setup = true;
85 ushort alpha;
86 background_colorbutton.Color = ReadColor (BezelDrawingArea.BgColor, out alpha);
87 background_colorbutton.Alpha = alpha;
88 clear_background.Sensitive = true;
89 background_colorbutton.Sensitive = shadow_check.Sensitive = true;
90 shadow_check.Active = BezelDrawingArea.DrawShadow;
91 animation_check.Active = BezelDrawingArea.Animated;
92 Gtk.Application.Invoke (delegate { setup = false; });
93 }
94
95 private Gdk.Color ReadColor (string colorString, out ushort alpha)
96 {
97 Gdk.Color prefsColor;
98 byte r,g,b;
99 uint converted;
100
101 try {
102 converted = uint.Parse (colorString, System.Globalization.NumberStyles.HexNumber);
103
104 alpha = (ushort) ((converted & 255) << 8);
105 b = (byte) ((converted >> 8) & 255);
106 g = (byte) ((converted >> 16) & 255);
107 r = (byte) ((converted >> 24) & 255);
108 prefsColor = new Gdk.Color (r,g,b);
109 } catch (Exception e) {
110 prefsColor = new Gdk.Color (0,0,0);
111 alpha = ushort.MaxValue;
112 if (colorString.ToLower () != "default") {
113 Log<ColorConfigurationWidget>.Error ("Error setting color: {0}", e.Message);
114 Log<ColorConfigurationWidget>.Debug (e.StackTrace);
115 }
116 }
117
118 return prefsColor;
119 }
120
121 67
122 public Gtk.Bin GetConfiguration ()68 public Gtk.Bin GetConfiguration ()
123 {69 {
124 return this;70 return this;
125 }71 }
12672
127 protected virtual void OnBackgroundColorbuttonColorSet (object sender, System.EventArgs e)
128 {
129 if (setup) return;
130 string hex_string = string.Format ("{0}{1:X}", background_colorbutton.Color.ColorToHexString (), (byte) (background_colorbutton.Alpha >> 8));
131 BezelDrawingArea.BgColor = hex_string;
132 }
133
134 protected virtual void OnClearBackgroundClicked (object sender, System.EventArgs e)
135 {
136 BezelDrawingArea.ResetBackgroundStyle ();
137 background_colorbutton.Color = new Gdk.Color (0, 0, 0);
138 background_colorbutton.Alpha = ushort.MaxValue;
139 }
140
141 protected virtual void OnShadowCheckClicked (object sender, System.EventArgs e)
142 {
143 if (setup) return;
144 BezelDrawingArea.DrawShadow = shadow_check.Active;
145 }
146
147 protected virtual void OnPinCheckClicked (object sender, System.EventArgs e)73 protected virtual void OnPinCheckClicked (object sender, System.EventArgs e)
148 {74 {
149 Do.Preferences.AlwaysShowResults = pin_check.Active;75 Do.Preferences.AlwaysShowResults = pin_check.Active;
@@ -152,11 +78,20 @@
152 protected virtual void OnThemeComboChanged (object sender, System.EventArgs e)78 protected virtual void OnThemeComboChanged (object sender, System.EventArgs e)
153 {79 {
154 Do.Preferences.Theme = Themes[theme_combo.Active];80 Do.Preferences.Theme = Themes[theme_combo.Active];
81 SetupConfigurationWidget ();
155 }82 }
15683
157 protected virtual void OnAnimationCheckbuttonClicked (object sender, System.EventArgs e)84 void SetupConfigurationWidget ()
158 {85 {
159 BezelDrawingArea.Animated = animation_check.Active;86 if (theme_configuration_container.Child != null)
87 theme_configuration_container.Remove (theme_configuration_container.Child);
88
89 if (Do.Controller.Window is IConfigurable) {
90 IConfigurable window = Do.Controller.Window as IConfigurable;
91 Gtk.Bin bin = window.GetConfiguration ();
92 theme_configuration_container.Add (bin);
93 }
94 theme_configuration_container.ShowAll ();
160 }95 }
16196
162 protected virtual void OnCompositeWarningInfoBtnClicked (object sender, System.EventArgs e)97 protected virtual void OnCompositeWarningInfoBtnClicked (object sender, System.EventArgs e)
@@ -174,6 +109,12 @@
174 public string Icon {109 public string Icon {
175 get { return ""; }110 get { return ""; }
176 }111 }
177 112
113 public override void Dispose ()
114 {
115 if (theme_configuration_container.Child != null)
116 theme_configuration_container.Child.Dispose ();
117 base.Dispose ();
118 }
178 }119 }
179}120}
180121
=== modified file 'Do/src/Do.UI/PreferencesWindow.cs'
--- Do/src/Do.UI/PreferencesWindow.cs 2009-01-05 22:19:09 +0000
+++ Do/src/Do.UI/PreferencesWindow.cs 2009-04-21 02:15:39 +0000
@@ -48,6 +48,7 @@
48 base (WindowType.Toplevel)48 base (WindowType.Toplevel)
49 {49 {
50 Build ();50 Build ();
51 IconName = "gnome-desktop-config";
5152
52 btn_close.IsFocus = true;53 btn_close.IsFocus = true;
53 54
@@ -74,5 +75,12 @@
74 {75 {
75 Services.Environment.OpenUrl (HelpUrl);76 Services.Environment.OpenUrl (HelpUrl);
76 }77 }
78
79 public override void Dispose ()
80 {
81 foreach (Gtk.Widget w in notebook.Children)
82 w.Dispose ();
83 base.Dispose ();
84 }
77 }85 }
78}86}
7987
=== modified file 'Makefile.am'
--- Makefile.am 2009-03-20 20:43:06 +0000
+++ Makefile.am 2009-04-21 03:00:56 +0000
@@ -10,12 +10,13 @@
10 Do.Platform \10 Do.Platform \
11 Do.Interface.Wink \11 Do.Interface.Wink \
12 Do.Interface.Linux \12 Do.Interface.Linux \
13 Do.Platform.Linux \
14 Do.Interface.Linux.AnimationBase \
13 Do.Interface.Linux.Classic \15 Do.Interface.Linux.Classic \
14 Do.Interface.Linux.Docky \16 Do.Interface.Linux.Docky \
15 Do.Interface.Linux.GlassFrame \17 Do.Interface.Linux.GlassFrame \
16 Do.Interface.Linux.HUD \18 Do.Interface.Linux.HUD \
17 Do.Interface.Linux.Mini \19 Do.Interface.Linux.Mini \
18 Do.Platform.Linux \
19 Do \20 Do \
20 po \21 po \
21 libdo \22 libdo \
2223
=== modified file 'configure.ac'
--- configure.ac 2009-03-20 20:43:06 +0000
+++ configure.ac 2009-04-20 00:24:22 +0000
@@ -128,6 +128,7 @@
128Do/src/AssemblyInfo.cs128Do/src/AssemblyInfo.cs
129Do.Interface.Linux/Makefile129Do.Interface.Linux/Makefile
130Do.Interface.Linux/src/AssemblyInfo.cs130Do.Interface.Linux/src/AssemblyInfo.cs
131Do.Interface.Linux.AnimationBase/Makefile
131Do.Interface.Linux.Classic/Makefile132Do.Interface.Linux.Classic/Makefile
132Do.Interface.Linux.Docky/Makefile133Do.Interface.Linux.Docky/Makefile
133Do.Interface.Linux.GlassFrame/Makefile134Do.Interface.Linux.GlassFrame/Makefile