[chronojump] Removed webKit until integrated in cerbero
- From: Xavier de Blas <xaviblas src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [chronojump] Removed webKit until integrated in cerbero
- Date: Mon, 15 Jun 2015 18:55:41 +0000 (UTC)
commit 6d257e152a31424dc7fb5abab341109e6f8e3926
Author: Xavier de Blas <xaviblas gmail com>
Date: Mon Jun 15 20:55:11 2015 +0200
Removed webKit until integrated in cerbero
build/build.environment.mk | 2 -
configure.ac | 1 -
glade/chronojump.glade | 59 ++++++++++++++++++++++++++++++++++++++++++-
src/gui/presentation.cs | 12 +++++++-
4 files changed, 67 insertions(+), 7 deletions(-)
---
diff --git a/build/build.environment.mk b/build/build.environment.mk
index f9c0a64..f3ae9b9 100644
--- a/build/build.environment.mk
+++ b/build/build.environment.mk
@@ -22,7 +22,6 @@ LINK_MONO_DATA_SQLITE = -r:Mono.Data.Sqlite
LINK_GLIB = $(GLIB_SHARP_20_LIBS)
LINK_GTK = $(GTK_SHARP_20_LIBS)
LINK_GLADE = $(GLADE_SHARP_20_LIBS)
-LINK_WEBKIT = $(WEBKIT_SHARP_10_LIBS)
LINK_CESARPLAYER = -r:$(DIR_BIN)/CesarPlayer.dll
LINK_JSON = -r:System.Json.dll
@@ -36,7 +35,6 @@ REF_DEP_CHRONOJUMP = \
$(LINK_MONO_DATA_SQLITE) \
$(LINK_GLIB) \
$(LINK_GLADE) \
- $(LINK_WEBKIT) \
$(LINK_GTK) \
$(LINK_CESARPLAYER) \
$(LINK_JSON)
diff --git a/configure.ac b/configure.ac
index e342930..8230ada 100644
--- a/configure.ac
+++ b/configure.ac
@@ -130,7 +130,6 @@ dnl package checks, common for all configs
PKG_CHECK_MODULES([GLIB_SHARP_20], [glib-sharp-2.0])
PKG_CHECK_MODULES([GTK_SHARP_20], [gtk-sharp-2.0])
PKG_CHECK_MODULES([GLADE_SHARP_20], [glade-sharp-2.0])
-PKG_CHECK_MODULES([WEBKIT_SHARP_10], [webkit-sharp-1.0])
PKG_CHECK_MODULES(CESARPLAYER, [gtk+-2.0 >= 2.8 gdk-2.0 gio-2.0 glib-2.0 gstreamer-0.10 gstreamer-audio-0.10
gstreamer-video-0.10 gstreamer-pbutils-0.10 gobject-2.0 gstreamer-interfaces-0.10 gstreamer-app-0.10
gstreamer-tag-0.10])
AC_SUBST(CESARPLAYER_CFLAGS)
diff --git a/glade/chronojump.glade b/glade/chronojump.glade
index 2e7dde8..bd33a28 100644
--- a/glade/chronojump.glade
+++ b/glade/chronojump.glade
@@ -417,13 +417,11 @@
</child>
<child>
<widget class="GtkSeparatorMenuItem" id="separador1">
- <property name="visible">True</property>
<property name="can_focus">False</property>
</widget>
</child>
<child>
<widget class="GtkMenuItem" id="menuitem_presentation">
- <property name="visible">True</property>
<property name="can_focus">False</property>
<property name="label">Presentation start / end</property>
<property name="use_underline">True</property>
@@ -7984,6 +7982,9 @@ Second Chronopic to platforms.</property>
<child>
<placeholder/>
</child>
+ <child>
+ <placeholder/>
+ </child>
</widget>
<packing>
<property name="expand">True</property>
@@ -8987,6 +8988,9 @@ Second Chronopic to platforms.</property>
<child>
<placeholder/>
</child>
+ <child>
+ <placeholder/>
+ </child>
</widget>
</child>
<child>
@@ -10242,6 +10246,9 @@ Second Chronopic to platforms.</property>
<child>
<placeholder/>
</child>
+ <child>
+ <placeholder/>
+ </child>
</widget>
<packing>
<property name="position">2</property>
@@ -11138,6 +11145,9 @@ Second Chronopic to platforms.</property>
<child>
<placeholder/>
</child>
+ <child>
+ <placeholder/>
+ </child>
</widget>
<packing>
<property name="position">4</property>
@@ -22378,6 +22388,9 @@ by you</property>
<child>
<placeholder/>
</child>
+ <child>
+ <placeholder/>
+ </child>
</widget>
</child>
</widget>
@@ -23179,6 +23192,9 @@ by you</property>
<child>
<placeholder/>
</child>
+ <child>
+ <placeholder/>
+ </child>
</widget>
</child>
</widget>
@@ -24472,6 +24488,9 @@ by you</property>
<placeholder/>
</child>
<child>
+ <placeholder/>
+ </child>
+ <child>
<widget class="GtkButton" id="button_video_url">
<property name="visible">True</property>
<property name="can_focus">True</property>
@@ -24822,6 +24841,9 @@ by you</property>
<child>
<placeholder/>
</child>
+ <child>
+ <placeholder/>
+ </child>
</widget>
<packing>
<property name="expand">True</property>
@@ -35395,6 +35417,24 @@ options</property>
<child>
<placeholder/>
</child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
</widget>
</child>
</widget>
@@ -37576,6 +37616,9 @@ To differentiate between male and female, use the values 1/0, or m/f, or M/F on
<child>
<placeholder/>
</child>
+ <child>
+ <placeholder/>
+ </child>
</widget>
</child>
</widget>
@@ -38415,6 +38458,9 @@ To differentiate between male and female, use the values 1/0, or m/f, or M/F on
<child>
<placeholder/>
</child>
+ <child>
+ <placeholder/>
+ </child>
</widget>
</child>
</widget>
@@ -41244,6 +41290,9 @@ show elevation as:</property>
<child>
<placeholder/>
</child>
+ <child>
+ <placeholder/>
+ </child>
</widget>
<packing>
<property name="left_attach">2</property>
@@ -41709,6 +41758,9 @@ show elevation as:</property>
<child>
<placeholder/>
</child>
+ <child>
+ <placeholder/>
+ </child>
</widget>
</child>
</widget>
@@ -42189,6 +42241,9 @@ show elevation as:</property>
<child>
<placeholder/>
</child>
+ <child>
+ <placeholder/>
+ </child>
</widget>
</child>
</widget>
diff --git a/src/gui/presentation.cs b/src/gui/presentation.cs
index 915ec88..a56eeaf 100644
--- a/src/gui/presentation.cs
+++ b/src/gui/presentation.cs
@@ -27,7 +27,7 @@ using System.Collections;
using System.Threading;
using Mono.Unix;
-using WebKit;
+//using WebKit;
public partial class ChronoJumpWindow
{
@@ -39,7 +39,7 @@ public partial class ChronoJumpWindow
[Widget] Gtk.Image image_presentation_logo;
[Widget] Gtk.Label label_presentation_current;
- static WebKit.WebView presentation;
+ //static WebKit.WebView presentation;
Thread presentationThread;
bool presentationInitialized = false;
@@ -52,6 +52,9 @@ public partial class ChronoJumpWindow
private void presentationInit() {
//button_presentation_restore_screen.Sensitive = false;
+ /*
+ * needs webKit
+ *
presentation = new WebKit.WebView();
scrolledwindow_presentation.Add(presentation);
@@ -60,6 +63,7 @@ public partial class ChronoJumpWindow
presentation.ShowAll();
presentationInitialized = true;
+ */
}
void on_button_presentation_screen_clicked (object o, EventArgs args) {
@@ -140,7 +144,11 @@ public partial class ChronoJumpWindow
}
private static void presentationOpenStatic(string url) {
+ /*
+ * needs WebKit
+ *
presentation.Open(url);
+ */
}
}
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
