[hyena: 89/89] Merge branch 'gtk3'
- From: Andrés Aragoneses <aaragoneses src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [hyena: 89/89] Merge branch 'gtk3'
- Date: Mon, 9 Sep 2013 12:16:37 +0000 (UTC)
commit 0cc9eb27cee0e22608ed24e716b1a1266db23788
Merge: 5ced332 fa67b29
Author: Andrés G. Aragoneses <knocte gmail com>
Date: Mon Sep 9 13:41:17 2013 +0200
Merge branch 'gtk3'
Conflicts:
Hyena.Gui/Hyena.Data.Gui/ListView/ListView_Accessible.cs
.gitattributes | 1 +
.../Accessibility/ColumnCellAccessible.cs | 2 +-
.../ColumnHeaderCellTextAccessible.cs | 2 +-
.../Accessibility/ListViewAccessible_Selection.cs | 2 +-
.../Accessibility/ListViewAccessible_Table.cs | 13 +-
Hyena.Gui/Hyena.Data.Gui/CellContext.cs | 4 +-
Hyena.Gui/Hyena.Data.Gui/ColumnCell.cs | 2 +-
Hyena.Gui/Hyena.Data.Gui/ColumnCellCheckBox.cs | 17 +-
Hyena.Gui/Hyena.Data.Gui/ColumnCellRating.cs | 2 +-
Hyena.Gui/Hyena.Data.Gui/ColumnCellText.cs | 5 +-
Hyena.Gui/Hyena.Data.Gui/ColumnHeaderCellText.cs | 2 +-
Hyena.Gui/Hyena.Data.Gui/ListView/ListView.cs | 1 +
.../Hyena.Data.Gui/ListView/ListView_Accessible.cs | 28 +-
.../Hyena.Data.Gui/ListView/ListView_Header.cs | 16 +-
.../ListView/ListView_Interaction.cs | 115 +++++---
.../Hyena.Data.Gui/ListView/ListView_Rendering.cs | 294 +++++++++++---------
.../Hyena.Data.Gui/ListView/ListView_Windowing.cs | 54 +++--
Hyena.Gui/Hyena.Data.Gui/ListViewTestModule.cs | 26 ++-
Hyena.Gui/Hyena.Gui.Canvas/Brush.cs | 6 +-
Hyena.Gui/Hyena.Gui.Canvas/CanvasHost.cs | 43 ++-
Hyena.Gui/Hyena.Gui.Canvas/Prelight.cs | 14 +-
Hyena.Gui/Hyena.Gui.Canvas/ShadowMarginStyle.cs | 2 +-
Hyena.Gui/Hyena.Gui.Canvas/Slider.cs | 31 ++-
Hyena.Gui/Hyena.Gui.Canvas/TestTile.cs | 2 +-
Hyena.Gui/Hyena.Gui.Canvas/TextBlock.cs | 24 +-
Hyena.Gui/Hyena.Gui.Dialogs/ExceptionDialog.cs | 5 +-
.../Hyena.Gui.Dialogs/VersionInformationDialog.cs | 6 +-
Hyena.Gui/Hyena.Gui.Theming/GtkColors.cs | 148 ----------
Hyena.Gui/Hyena.Gui.Theming/GtkTheme.cs | 158 ++++-------
Hyena.Gui/Hyena.Gui.Theming/Theme.cs | 74 +++--
Hyena.Gui/Hyena.Gui.Theming/ThemeTestModule.cs | 29 +--
Hyena.Gui/Hyena.Gui.csproj | 3 -
Hyena.Gui/Hyena.Gui/BaseWidgetAccessible.cs | 15 +-
Hyena.Gui/Hyena.Gui/CairoDamageDebugger.cs | 2 +-
Hyena.Gui/Hyena.Gui/CairoExtensions.cs | 18 +-
Hyena.Gui/Hyena.Gui/CompositeUtils.cs | 80 +-----
Hyena.Gui/Hyena.Gui/EditableEraseAction.cs | 4 +-
Hyena.Gui/Hyena.Gui/EditableInsertAction.cs | 4 +-
Hyena.Gui/Hyena.Gui/EditableUndoAdapter.cs | 4 +-
Hyena.Gui/Hyena.Gui/GtkUtilities.cs | 83 ++----
Hyena.Gui/Hyena.Gui/GtkWorkarounds.cs | 92 ------
Hyena.Gui/Hyena.Gui/HyenaActionGroup.cs | 4 +-
Hyena.Gui/Hyena.Gui/RatingRenderer.cs | 6 +-
Hyena.Gui/Hyena.Gui/ShadingTestWindow.cs | 14 +-
Hyena.Gui/Hyena.Gui/TooltipSetter.cs | 87 ------
.../Hyena.Query.Gui/FileSizeQueryValueEntry.cs | 4 +-
Hyena.Gui/Hyena.Query.Gui/QueryBox.cs | 6 +-
Hyena.Gui/Hyena.Query.Gui/QueryLimitBox.cs | 10 +-
Hyena.Gui/Hyena.Query.Gui/QueryTermBox.cs | 18 +-
.../Hyena.Query.Gui/TimeSpanQueryValueEntry.cs | 4 +-
Hyena.Gui/Hyena.Widgets/AnimatedBox.cs | 25 ++-
Hyena.Gui/Hyena.Widgets/AnimatedVBox.cs | 81 ++++++
Hyena.Gui/Hyena.Widgets/AnimatedWidget.cs | 64 +++--
Hyena.Gui/Hyena.Widgets/ComplexMenuItem.cs | 34 ++-
Hyena.Gui/Hyena.Widgets/EntryPopup.cs | 15 +-
Hyena.Gui/Hyena.Widgets/GrabHandle.cs | 14 +-
Hyena.Gui/Hyena.Widgets/HigMessageDialog.cs | 5 +-
Hyena.Gui/Hyena.Widgets/MenuButton.cs | 18 +-
Hyena.Gui/Hyena.Widgets/MessageBar.cs | 37 +---
Hyena.Gui/Hyena.Widgets/PulsingButton.cs | 40 ++--
Hyena.Gui/Hyena.Widgets/RatingEntry.cs | 91 ++++---
Hyena.Gui/Hyena.Widgets/RoundedFrame.cs | 70 +++--
Hyena.Gui/Hyena.Widgets/SegmentedBar.cs | 206 +++++++-------
Hyena.Gui/Hyena.Widgets/TextViewEditable.cs | 12 +-
Hyena.Gui/Hyena.Widgets/WrapLabel.cs | 18 +-
Hyena.Gui/Makefile.am | 5 +-
Hyena.sln | 31 ++-
Hyena/Hyena.Data/IListModel.cs | 3 +-
Makefile.am | 8 +
configure.ac | 7 +-
70 files changed, 1093 insertions(+), 1277 deletions(-)
---
diff --cc Hyena.Gui/Hyena.Data.Gui/ListView/ListView_Accessible.cs
index 7c50e56,7b991e7..1aca99f
--- a/Hyena.Gui/Hyena.Data.Gui/ListView/ListView_Accessible.cs
+++ b/Hyena.Gui/Hyena.Data.Gui/ListView/ListView_Accessible.cs
@@@ -157,30 -157,17 +157,26 @@@ namespace Hyena.Data.Gu
{
public static void Init ()
{
- new ListViewAccessibleFactory<T> ();
- Atk.Global.DefaultRegistry.SetFactoryType ((GLib.GType)typeof (ListView<T>), (GLib.GType)typeof
(ListViewAccessibleFactory<T>));
- CreateAccessibleHandler = (obj) => {
- Log.InformationFormat ("Creating Accessible for {0}", obj);
- var accessible = new ListViewAccessible<T> (obj);
- (obj as ListView<T>).accessible = accessible;
- return accessible;
- };
- GetAccessibleTypeHandler = ()=> {
- return ListViewAccessible<T>.GType;
- };
+ try {
+ // Test creating a dummy accessible, which may throw if gobject binding has issues.
+ // If it throws, a11y for ListView will not be enabled.
+ // (workaround for https://bugzilla.xamarin.com/show_bug.cgi?id=11510)
+ new ListViewAccessible<T> (new ListView<T> ());
+
+ new ListViewAccessibleFactory<T> ();
+ Atk.Global.DefaultRegistry.SetFactoryType ((GLib.GType)typeof (ListView<T>),
(GLib.GType)typeof (ListViewAccessibleFactory<T>));
++ CreateAccessibleHandler = (obj) => {
++ Log.InformationFormat ("Creating Accessible for {0}", obj);
++ var accessible = new ListViewAccessible<T> (obj);
++ (obj as ListView<T>).accessible = accessible;
++ return accessible;
++ };
++ GetAccessibleTypeHandler = ()=> {
++ return ListViewAccessible<T>.GType;
++ };
+ } catch (Exception ex) {
+ Log.Exception ("Initialization of accessibility support for ListView widgets failed", ex);
+ }
}
-
- protected override Atk.Object OnCreateAccessible (GLib.Object obj)
- {
- Log.InformationFormat ("Creating Accessible for {0}", obj);
- var accessible = new ListViewAccessible<T> (obj);
- (obj as ListView<T>).accessible = accessible;
- return accessible;
- }
-
- protected override GLib.GType OnGetAccessibleType ()
- {
- return ListViewAccessible<T>.GType;
- }
}
}
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]