Skip to content
Snippets Groups Projects
Commit 3008b3fd authored by callum's avatar callum
Browse files

Main change is pointing install.xml for Windows to new version of LLQtWebKit...

Main change is pointing install.xml for Windows to new version of LLQtWebKit that has DLLs with no manifest as per recent build change.
Tweaked bookamrks for test app too.
Finally, added fix for DEV-41392 (Home URL Preview should be next to the Home URL)
parent 2b69cb9e
No related branches found
No related tags found
No related merge requests found
...@@ -207,7 +207,7 @@ void LLPanelMediaSettingsGeneral::clearValues( void* userdata, bool editable) ...@@ -207,7 +207,7 @@ void LLPanelMediaSettingsGeneral::clearValues( void* userdata, bool editable)
self->mHeightPixels ->setEnabled(editable); self->mHeightPixels ->setEnabled(editable);
self->mHomeURL ->setEnabled(editable); self->mHomeURL ->setEnabled(editable);
self->mWidthPixels ->setEnabled(editable); self->mWidthPixels ->setEnabled(editable);
self->mPreviewMedia->unloadMediaSource(); self->updateMediaPreview();
} }
//////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////
...@@ -312,10 +312,10 @@ void LLPanelMediaSettingsGeneral::updateMediaPreview() ...@@ -312,10 +312,10 @@ void LLPanelMediaSettingsGeneral::updateMediaPreview()
mPreviewMedia->navigateTo( mHomeURL->getValue().asString() ); mPreviewMedia->navigateTo( mHomeURL->getValue().asString() );
} }
else else
// new home URL will be empty if media is deleted but // new home URL will be empty if media is deleted so display a
// we still need to clean out the preview. // "preview goes here" data url page
{ {
mPreviewMedia->unloadMediaSource(); mPreviewMedia->navigateTo( "data:image/svg+xml,%3Csvg xmlns=%22http://www.w3.org/2000/svg%22 width=%22100%%22 height=%22100%%22 %3E%3Cdefs%3E%3Cpattern id=%22checker%22 patternUnits=%22userSpaceOnUse%22 x=%220%22 y=%220%22 width=%22128%22 height=%22128%22 viewBox=%220 0 128 128%22 %3E%3Crect x=%220%22 y=%220%22 width=%2264%22 height=%2264%22 fill=%22#ddddff%22 /%3E%3Crect x=%2264%22 y=%2264%22 width=%2264%22 height=%2264%22 fill=%22#ddddff%22 /%3E%3C/pattern%3E%3C/defs%3E%3Crect x=%220%22 y=%220%22 width=%22100%%22 height=%22100%%22 fill=%22url(#checker)%22 /%3E%3C/svg%3E" );
}; };
} }
......
...@@ -32,6 +32,27 @@ ...@@ -32,6 +32,27 @@
<!-- <line_editor.commit_callback <!-- <line_editor.commit_callback
function="Media.CommitHomeURL"/> --> function="Media.CommitHomeURL"/> -->
</line_editor> </line_editor>
<web_browser
border_visible="true"
bottom_delta="-133"
follows="top|left"
left="120"
name="preview_media"
width="128"
height="128"
start_url="about:blank"
decouple_texture_size="true" />
<text
bottom_delta="-15"
follows="top|left"
height="15"
left="164"
name="">
Preview
</text>
<text <text
bottom_delta="-20" bottom_delta="-20"
follows="top|left" follows="top|left"
...@@ -62,27 +83,6 @@ ...@@ -62,27 +83,6 @@
<button.commit_callback <button.commit_callback
function="Media.ResetCurrentUrl"/> function="Media.ResetCurrentUrl"/>
</button> </button>
<web_browser
border_visible="false"
bottom_delta="-133"
follows="top|left"
left="120"
name="preview_media"
width="128"
height="128"
start_url="about:blank"
decouple_texture_size="true" />
<text
bottom_delta="-15"
follows="top|left"
height="15"
left="164"
name="">
Preview
</text>
<text <text
bottom_delta="-5" bottom_delta="-5"
follows="top|left" follows="top|left"
......
...@@ -8,6 +8,7 @@ ...@@ -8,6 +8,7 @@
(WK) Canvas Paint (DHTML version of MS Paint),http://www.canvaspaint.org (WK) Canvas Paint (DHTML version of MS Paint),http://www.canvaspaint.org
(WK) DHTML Lemmings!,http://www.elizium.nu/scripts/lemmings/ (WK) DHTML Lemmings!,http://www.elizium.nu/scripts/lemmings/
(WK) DHTML graphics demos,http://www.dhteumeuleu.com/ (WK) DHTML graphics demos,http://www.dhteumeuleu.com/
(WK) Shared paint app,http://colorillo.com/ac79?1l0q6cp
(Flash) YouTube,http://youtube.com (Flash) YouTube,http://youtube.com
(Flash) Vimeo,http://www.vimeo.com/1778399 (Flash) Vimeo,http://www.vimeo.com/1778399
(Flash) Simple whiteboard,http://www.imaginationcubed.com/ (Flash) Simple whiteboard,http://www.imaginationcubed.com/
......
...@@ -962,9 +962,9 @@ anguage Infrstructure (CLI) international standard</string> ...@@ -962,9 +962,9 @@ anguage Infrstructure (CLI) international standard</string>
<key>windows</key> <key>windows</key>
<map> <map>
<key>md5sum</key> <key>md5sum</key>
<string>6c6282025d1b8cd9e70c0f858a14fdca</string> <string>6f2f911545e5906edc87f4f3cda423a1</string>
<key>url</key> <key>url</key>
<uri>http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/llqtwebkit-windows-20091001.tar.bz2</uri> <uri>http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/llqtwebkit-windows-20091023.tar.bz2</uri>
</map> </map>
</map> </map>
</map> </map>
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment