Commit 6d257e15 authored by Xavier de Blas's avatar Xavier de Blas

Removed webKit until integrated in cerbero

parent c150a819
......@@ -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)
......
......@@ -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)
......
......@@ -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>
......@@ -24471,6 +24487,9 @@ by you</property>
<child>
<placeholder/>
</child>
<child>
<placeholder/>
</child>
<child>
<widget class="GtkButton" id="button_video_url">
<property name="visible">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>
......@@ -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);
*/
}
}
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment