diff --git a/oem/firstvoices/windows/.gitignore b/oem/firstvoices/windows/.gitignore index ad51cca561..58e1ecbc7a 100644 --- a/oem/firstvoices/windows/.gitignore +++ b/oem/firstvoices/windows/.gitignore @@ -6,6 +6,7 @@ src/inst/*.exe src/inst/download.mak src/inst/fv_all.kmp src/xml/localedef.dtd +src/xml/sentry.init.js **/Thumbs.db # Temporary ignores diff --git a/oem/firstvoices/windows/src/branding/menutitle.png b/oem/firstvoices/windows/src/branding/menutitle.png index 3cbd973be4..70d7fa600f 100644 Binary files a/oem/firstvoices/windows/src/branding/menutitle.png and b/oem/firstvoices/windows/src/branding/menutitle.png differ diff --git a/oem/firstvoices/windows/src/inst/Makefile b/oem/firstvoices/windows/src/inst/Makefile index a0e2ec268a..be9f4ad9f6 100644 --- a/oem/firstvoices/windows/src/inst/Makefile +++ b/oem/firstvoices/windows/src/inst/Makefile @@ -11,7 +11,7 @@ MSI=firstvoices.msi EXE=firstvoices.exe KMP=fv_all.kmp INTEXE=firstvoices-fv_all.exe -APPTITLE="FirstVoices Keyboards" +APPTITLE="Keyman for FirstVoices" TITLEIMAGE=setuptitle.png # If doing manual build of the project, manual-setup is the default target @@ -28,6 +28,9 @@ prereq: cd $(FVROOT)\src\inst $(MKVER_U) download.in download.mak + cd $(FVROOT)\src\xml + $(MKVER_U) sentry.init.js.in sentry.init.js + # # Build FirstVoices keyboards fv_all.kmp # diff --git a/oem/firstvoices/windows/src/inst/license.html b/oem/firstvoices/windows/src/inst/license.html index f8734937cf..9c601dc5c7 100644 --- a/oem/firstvoices/windows/src/inst/license.html +++ b/oem/firstvoices/windows/src/inst/license.html @@ -9,7 +9,7 @@ -

FirstVoices Keyboards

+

Keyman for FirstVoices and FirstVoices Keyboards

The MIT License

diff --git a/oem/firstvoices/windows/src/inst/license.rtf b/oem/firstvoices/windows/src/inst/license.rtf index c086fa8dfa..d26ff0142c 100644 Binary files a/oem/firstvoices/windows/src/inst/license.rtf and b/oem/firstvoices/windows/src/inst/license.rtf differ diff --git a/oem/firstvoices/windows/src/inst/setuptitle.png b/oem/firstvoices/windows/src/inst/setuptitle.png index c4d82690d4..1c2e00fe8f 100644 Binary files a/oem/firstvoices/windows/src/inst/setuptitle.png and b/oem/firstvoices/windows/src/inst/setuptitle.png differ diff --git a/oem/firstvoices/windows/src/xml/basekeyboard.xsl b/oem/firstvoices/windows/src/xml/basekeyboard.xsl index 0a993ff776..85bdf38672 100644 --- a/oem/firstvoices/windows/src/xml/basekeyboard.xsl +++ b/oem/firstvoices/windows/src/xml/basekeyboard.xsl @@ -1,20 +1,21 @@ - + - + - + + <xsl:value-of select="$locale/string[@name='S_BaseKeyboard_Title']"/> - config.css + - - - - - - - - -
-
-
- -
-
-
-
- - - -
- - - - - -
-
- -
-
- - - - - -
-
- - - -
-
- -
- -
-
- - - -
-
-
-
-
- -
-
- - - - - - -
-
- - - -
-
-
-
- -
-
-
-
- - - - -
-
-
-
-
-
-
- -
-
-
- - - info.png - - - - -
-
-
-
- -
-
-
-
-
-
-
-
-
- - - - -
- - - - font_ - - - - - % - - - - - - - char excluded - U+ - - - - - -
diff --git a/oem/firstvoices/windows/src/xml/globe.png b/oem/firstvoices/windows/src/xml/globe.png new file mode 100644 index 0000000000..ceb2d60db1 Binary files /dev/null and b/oem/firstvoices/windows/src/xml/globe.png differ diff --git a/oem/firstvoices/windows/src/xml/help.xsl b/oem/firstvoices/windows/src/xml/help.xsl index dbd20a37f9..16a1865438 100644 --- a/oem/firstvoices/windows/src/xml/help.xsl +++ b/oem/firstvoices/windows/src/xml/help.xsl @@ -11,11 +11,12 @@ - + + <xsl:value-of select="$locale/string[@name='S_HelpTitle']" /> - config.css + - - +
@@ -50,14 +50,14 @@ - defaultkeyboard.gif + /app/defaultkeyboard.gif - + /data/installkeyboard/package/?tag= height: 250px; width: 140px; border: solid 1px black - defaultpackage.gif + /app/defaultpackage.gif @@ -70,10 +70,10 @@
- +
@@ -82,13 +82,11 @@ - + /data/installkeyboard/bitmap/?tag= - - no_icon.gif - + @@ -106,7 +104,7 @@ - keyman:keyboard_installallusers + javascript:keyboard_install(true) 120px 1 @@ -115,7 +113,7 @@ 1 - keyman:keyboard_install + javascript:keyboard_install(false) 70px @@ -129,15 +127,32 @@ - - -
+ + + + + + + + + + +

- +
@@ -160,7 +175,7 @@ - + @@ -168,27 +183,46 @@ - + - - - - - + + + + + + + + + + + + + + + + + + + + + + - + - + - + @@ -207,7 +241,7 @@ - + \ No newline at end of file diff --git a/oem/firstvoices/windows/src/xml/keyman-desktop-for-first-voices-486x86-black.png b/oem/firstvoices/windows/src/xml/keyman-desktop-for-first-voices-486x86-black.png index 3b5ec042c7..60cfe5c77a 100644 Binary files a/oem/firstvoices/windows/src/xml/keyman-desktop-for-first-voices-486x86-black.png and b/oem/firstvoices/windows/src/xml/keyman-desktop-for-first-voices-486x86-black.png differ diff --git a/oem/firstvoices/windows/src/xml/keyman-desktop.png b/oem/firstvoices/windows/src/xml/keyman-desktop.png index e344653015..d902bbd122 100644 Binary files a/oem/firstvoices/windows/src/xml/keyman-desktop.png and b/oem/firstvoices/windows/src/xml/keyman-desktop.png differ diff --git a/oem/firstvoices/windows/src/xml/keyman.xsl b/oem/firstvoices/windows/src/xml/keyman.xsl index 110ee2e894..e96f064191 100644 --- a/oem/firstvoices/windows/src/xml/keyman.xsl +++ b/oem/firstvoices/windows/src/xml/keyman.xsl @@ -1,11 +1,11 @@ - + - + @@ -15,24 +15,29 @@ - + + + + <xsl:value-of select="$locale/string[@name='S_ConfigurationTitle']"/> - config.css - menu.css - - - - - - + + + + + + + + + - +
+
@@ -102,9 +95,9 @@
- list_hotkey_ - return list_keydown(event,'hotkey_'); - document.getElementById('list_hotkey_').focus(); return true; + list_hotkey_ + return list_keydown(event,'hotkey_'); + document.getElementById('list_hotkey_').focus(); return true;
@@ -112,7 +105,7 @@ - + @@ -122,13 +115,13 @@
diff --git a/oem/firstvoices/windows/src/xml/keyman_keepintouch.xsl b/oem/firstvoices/windows/src/xml/keyman_keepintouch.xsl index 641faec994..4f1eabb39d 100644 --- a/oem/firstvoices/windows/src/xml/keyman_keepintouch.xsl +++ b/oem/firstvoices/windows/src/xml/keyman_keepintouch.xsl @@ -5,7 +5,7 @@ diff --git a/oem/firstvoices/windows/src/xml/keyman_keyboardlist.xsl b/oem/firstvoices/windows/src/xml/keyman_keyboardlist.xsl index bd93b63c0b..18378bc390 100644 --- a/oem/firstvoices/windows/src/xml/keyman_keyboardlist.xsl +++ b/oem/firstvoices/windows/src/xml/keyman_keyboardlist.xsl @@ -2,7 +2,7 @@ - + @@ -13,7 +13,7 @@
- +
@@ -30,16 +30,14 @@ - + - +
package_ - - - package.gif - + +
@@ -58,11 +56,7 @@
- - - info.png - - +
@@ -95,7 +89,7 @@ return list_focus(event,'keyboard_'); return list_blur(event,'keyboard_'); event.cancelBubble=true;event.returnValue=false; - + left:0;top:0;width:99%
return list_detail(event,'keyboard_'); @@ -113,17 +107,8 @@
- - - - - - - - - no_icon.gif - - + /data/keyman/bitmap/?tag= + /app/no_icon.gif
@@ -138,11 +123,11 @@
- -
+ + +
@@ -275,6 +260,45 @@ + + +
 
@@ -284,21 +308,20 @@
- +
- +
- + \ No newline at end of file diff --git a/oem/firstvoices/windows/src/xml/keyman_menu.xsl b/oem/firstvoices/windows/src/xml/keyman_menu.xsl index e5d9f3acec..b5adc5de7c 100644 --- a/oem/firstvoices/windows/src/xml/keyman_menu.xsl +++ b/oem/firstvoices/windows/src/xml/keyman_menu.xsl @@ -2,14 +2,14 @@ - + diff --git a/oem/firstvoices/windows/src/xml/keyman_options.xsl b/oem/firstvoices/windows/src/xml/keyman_options.xsl index 363be1664d..65acc0c817 100644 --- a/oem/firstvoices/windows/src/xml/keyman_options.xsl +++ b/oem/firstvoices/windows/src/xml/keyman_options.xsl @@ -14,7 +14,7 @@
- + @@ -29,7 +29,13 @@ keyman:support_proxyconfig - + + + 1 @@ -73,13 +79,13 @@
- vertical-align: middle; display: inline; margin-left: 3px; color: #808080 + display: inline; margin-left: 3px; color: #808080 - vertical-align: middle; display: inline; margin-left: 3px; + display: inline; margin-left: 3px; - +
diff --git a/oem/firstvoices/windows/src/xml/keyman_support.xsl b/oem/firstvoices/windows/src/xml/keyman_support.xsl index 5c489746fe..dfd8c8445b 100644 --- a/oem/firstvoices/windows/src/xml/keyman_support.xsl +++ b/oem/firstvoices/windows/src/xml/keyman_support.xsl @@ -2,28 +2,23 @@ - - + +
-
- - - keyman-desktop.png - - +
- +
-  
+  
- +
- - \ No newline at end of file + diff --git a/oem/firstvoices/windows/src/xml/locale.xml b/oem/firstvoices/windows/src/xml/locale.xml deleted file mode 100644 index 0d1c4f81a6..0000000000 --- a/oem/firstvoices/windows/src/xml/locale.xml +++ /dev/null @@ -1,583 +0,0 @@ - - - - - - -]> - - - - - -Keyman - -Tahoma -8 - - - - - - - -&Name_CNV; - - - - - -Yes -No - -&Yes -&No - -OK -Cancel -Close -Apply -Remind me Later - -OK -Cancel - -Click this icon to select a keyboard -&Name; is still running. Click this icon to use your language keyboard at any time - - - - - -&Name; Configuration - - - 40 - 118 - 40 - - -Help - - - -Keyboard Layouts K -Options O -Hotkeys H -Support S -Keep in Touch T - - - -Filename: - -Package version: -Keyboard version: -Author: -Website: - -Package: -Fonts: -Keyboard Layouts: - -Encodings: - -Layout Type: - Fixed (Positional) - Mapped to Windows layout (Mnemonic) - -Description: - -Installed for: - All users - Current user - -Languages: - - Add language - -On Screen Keyboard: - Custom - Installed - Not installed - -Documentation: - Installed - Not installed - -Message: -Copyright: - - - -Package options -Options -Install keyboard... -Download keyboard... - - Keyboard options -Uninstall -Uninstall package -Show introductory help -Change hotkey -Set hotkey -Uninstall On Screen Keyboard -Install On Screen Keyboard... - -You do not have any keyboards installed. Click the Download Keyboard button to install a keyboard layout from the Keyman website. -You can only uninstall the keyboard '%0:s' if you are an Administrator - - - -General -Startup -On Screen Keyboard -Advanced - -Keyboard hotkeys toggle keyboard activation -Simulate AltGr with Ctrl+Alt -Treat hardware deadkeys as plain keys -Show hint messages - -Start when Windows starts -Show splash screen -Show welcome screen -Automatically check keyman.com weekly for updates -Test for conflicting applications when &Name; starts - -Release Shift/Ctrl/Alt on On Screen Keyboard after clicking a key -Always show On Screen Keyboard Window when Keyman keyboard is selected -Switch to appropriate On Screen Keyboard/Help automatically when a keyboard is selected - -Turn on Unicode supplementary character display (requires restart) -Turn on 'Unknown' language -Debugging -Switch Windows language when a Keyman keyboard is selected - Select keyboard layout for all applications -Always elevate user permissions when running in Windows Vista - -User interface language... - -Base Keyboard... - - - - - - - - - -(none) -Switch &Name; Off -Open Keyboard Menu -Show On Screen Keyboard Pane -Open Configuration - -Show Keyboard Usage Pane -Show Font Helper Pane -Show Character Map Pane -Open Text Editor - -Open Language Switcher - -General Hotkeys -Keyboard Layouts - - - -Installed Language -Windows Layout -Keyman Keyboard - -(use Windows layout) - - - -Upgrade now! -Send Support Request -Contact Keyman Support -If you have any issues using Keyman, just ask us for help. -Open FirstVoices Help Center -Created by SIL International -Copyright © SIL International. All Rights Reserved. -Version -Engine Version - -Useful Links - -Online Help -Diagnostics -Check for Updates -Proxy Settings... - -Diagnostics -Check Language Settings - -Microsoft Windows appears to be correctly configured for your language(s). - - - - - - - 40 - - -Download Keyboard From keyman.com -Don't install, just download - - - - - - - - - -Install Keyboard/Package - -Details -Readme - -Install -Install for all users - - - - - - - -Proxy Server Configuration - -Server: -Port: -Username: -Password: - - - - - - - -Set Base Keyboard -Select the base Latin script -keyboard that you use in Windows. Keyman keyboards will adapt automatically to your preferred layout. - - - - - -Change Hotkey - -&Clear Hotkey -Select a standard hotkey or choose 'Custom' and hold Ctrl,Shift and/or Alt and type your desired hotkey for keyboard %0:s: -Select a standard hotkey or choose 'Custom' and hold Ctrl,Shift and/or Alt and type your desired hotkey for language %0:s: -Select a standard hotkey or choose 'Custom' and hold Ctrl,Shift and/or Alt and type your desired hotkey: - -The hotkey %0:s will conflict with normal keyboard use. You should use at least Ctrl or Alt. Do you want to change this now? -The hotkey %0:s conflicts with the hotkey selected for keyboard %1:s. If you continue, the hotkey for keyboard %1:s will be cleared. Continue? - - - - - -Select Keyboards to Install -You cannot install all the keyboards in this package. You can install a maximum of %0:d additional keyboards. Please select the keyboards you wish to install from this package. - - - - - - - -Updated &Name; Components Available - -Updates for &Name_CN; are now available -Please select the updates you wish to install: - -Do you want to download and install this patch now? -You can download the new version from: -Do you want to visit the website now? - -Install Now -Cancel - -Old Version -Updated Component -Size - -&Name; %0:s -Keyboard %0:s %1:s - -Unable to contact keyman.com - please make sure you have an active Internet connection and try again. -Unable to contact keyman.com - please make sure you have an active Internet connection and try again. The error received was: %0:s - -&Name; updates are available -Click this icon to download and install updates -View and &install &Name; updates -E&xit online update check - - - - - - - -&Name_CNV; -&Name; - - -Start Keyman -Exit - -Other tasks - Configuration - Show this screen at startup - Hide this screen at startup - - - - - -Display in -Find other display languages online... -Help translate the user interface... -English -English -en -en - -&Name; - -Select User Interface Language - -Choose the language that you want displayed in the &Name; interface. -&More languages online... - -Create a new translation online - - - - - - -Language Configuration Tasks - -Configure your computer to work with - - -&Name; has detected that the following configuration tasks need to be completed in order for -script(s) to work correctly on your computer: - -Microsoft Office Language Support - -More Information... - -Do you want &Name; to complete these tasks now? - - -Don't ask me about this again - - - - - - - 40 - 40 - - -Reset Hints -All hint messages have been reset and will be displayed again. - -Exit &Name;? -Are you sure you want to exit &Name;? Your Keyman keyboards will still be listed in the Windows languages, but will not be functional until you restart &Name;. - -On Screen Keyboard Closed -You have closed the On Screen Keyboard. &Name; is still running. You can open the On Screen Keyboard at any time by clicking on the &Name; Icon and selecting "On Screen Keyboard" - -Don't show this hint again - - - - - - -&Name; Help -Help Contents - -Help on " -" keyboard - -View On Screen Keyboard -View Keyboard Usage -View Font Helper -View Character Map -Switch &Name; Off -Open &Name; Configuration -Open Help -Close On Screen Keyboard - - - - - -Switch &Name; &Off -On Screen &Keyboard -Keyboard &Usage -&Font Helper -Character &Map -&Text Editor... -&Configuration... - -&Help... -E&xit - -No keyboard layouts are installed. -Choose "Configuration" to install a -keyboard layout for your language. - -Fade When Inactive -Show Toolbar -Save as Web Page... -Print... - - - - - - - - - -&Name_CN; -Version %0:s - -Help -&Print... -&Download... - - - -A package with the name %0:s is already installed. Do you want to uninstall it and install the new one? -A keyboard with the name '%0:s' is already installed. If you continue, it will be uninstalled before the new one is installed. Continue? -The keyboard '%0:s' is part of package '%1:s'. You must uninstall the entire package. Continue? -You can only install or uninstall keyboards as Administrator. Use Control Panel to select languages for use as a normal user. -Changing the setting of Surrogates requires Windows to be restarted. Do you want to restart Windows now? -The package or keyboard '%0:s' does not include any introductory help. -This operating system is not supported. -Your licence has been successfully activated. -KeymanDesktop.chm -The help file $(SKOnlineHelpFile) could not be found. -<Damaged keyboard> -Codepage -Unicode -Downloading File - - - - -Are you sure you want to remove the on screen keyboard installed for %0:s? -Are you sure you want to uninstall keyboard %0:s? -Are you sure you want to uninstall package %0:s? - -%1:s -The following fonts will also be uninstalled: %0:s. -Do you want to activate $(SKShortApplicationTitle) online now with licence number %0:s? If you click No, you can choose from alternate activation methods. -The Character Map has a database of characters that needs to be built before it can be used. Build it now? - - - -The Unicode Character database could not be deleted for a rebuild. Error details are: %0:s -The Unicode Character database could not be created and has been disabled. Error details are: %0:s -The Unicode character database did not load successfully (%0:s). Rebuild it now? - - -Cannot activate browser or email program for this URL. -The keyboard could not be printed successfully. Please save to a web page and print manually. -&Name; failed to start. Please check your security settings to make sure that the program keyman.exe is allowed to start before continuing. The error returned was: - -"%0:s" - -Do you want to try and start &Name; again now? - - - -&Name; debug information will be stored in a log file called %LOCALAPPDATA%\Keyman\Diag\system#.etl (where # is a number). You should exit &Name; before attempting to delete this file. - -WARNING: This file can grow large very quickly. Enabling debugging may slow down your system and should only be done if advised by technical support. - -PRIVACY WARNING: Please note that the debug logfile records all keystrokes that you type. You should only turn on the debug log for the duration of a debugging or diagnostic session. - - - -Add %0:s editing support to %1:s -Microsoft Office 2000 -Microsoft Office XP -Microsoft Office 2003 -Microsoft Office 2007 -Microsoft Office 2010 - - -Link language %0:s to Keyman keyboard %1:s -Install language %0:s and link to Keyman keyboard %1:s - - - -Please wait while &Name; finds the fonts that will work with -keyboard. - - -is not a Unicode keyboard. Fonts cannot be automatically located. Please check the keyboard documentation for font information. - -The following fonts work with -keyboard: - -The following fonts may also work: - -The following fonts may work with -keyboard: - -No fonts were found on your system that work with -. Please check the documentation to find fonts for this keyboard. - -No keyboard layouts are currently installed or loaded. Use &Name; Configuration to install a keyboard layout. -Please choose a &Name; keyboard to find the fonts that will work with it. - - - -Hint: -Resize the On Screen Keyboard by clicking and dragging on the window border -Move the On Screen Keyboard by clicking and dragging on the "&Name;" title -Insert any Unicode character into your document with the -Character Map Tool -Find out which fonts will work with your language with the -Font Helper Tool -Get more help on the keyboard by clicking the -Keyboard Usage button - - - - - -Text Editor - &Name; - - diff --git a/oem/firstvoices/windows/src/xml/menu-frame.js b/oem/firstvoices/windows/src/xml/menu-frame.js index 95aa0797c6..6c77e7478f 100644 --- a/oem/firstvoices/windows/src/xml/menu-frame.js +++ b/oem/firstvoices/windows/src/xml/menu-frame.js @@ -1,5 +1,5 @@ var menuframe_activeindex=0, menuframe_items = []; - + function menuframe_add(path, name, description, hotkey) { var n = menuframe_items.length; @@ -13,18 +13,18 @@ menuframe_items[n].menu_hotkey = hotkey; menuframe_items[n].menu_name = name; } - + function menuframe_activate(n) { var p = menuframe_items[menuframe_activeindex], c = menuframe_items[n]; var itemtype, blah; - - p.className='menuframe'; - c.className='menuframe_active'; + + p.className='menuframe'; + c.className='menuframe_active'; menuframe_activeindex=n; document.getElementById('content_'+p.menu_name).style.display = 'none'; document.getElementById('content_'+c.menu_name).style.display = 'block'; - + save_state(); if(!loading_state) { @@ -32,19 +32,19 @@ for(var i = 0; i < q.length; i++) { blah = q[i].id; itemtype = blah.substr(0, 5); - + if( itemtype == "list_" ) { q[i].focus(); break; } } } - + if(typeof window['menuframe_activate_'+c.menu_name] != 'undefined') { window['menuframe_activate_'+c.menu_name](); } } - + function menuframe_keydown(event) //document.onkeydown = function() { @@ -80,16 +80,11 @@ } break; case 13: // enter - if( event.target.id.substring(0,6) != 'button' && event.target.tagName != 'TEXTAREA' ) { - event.cancelBubble = true; event.returnValue = false; - location.href='keyman:footer_ok'; - break; - } - event.cancelBubble = true; event.returnValue = true; + event.cancelBubble = true; + event.returnValue = event.target.id.substring(0,6) == 'button' || event.target.tagName == 'TEXTAREA'; break; case 27: // esc event.cancelBubble = true; event.returnValue = false; - location.href='keyman:footer_cancel'; break; case 32: // spacebar switch(event.srcElement.tagName.toLowerCase()) { @@ -103,18 +98,18 @@ document.getElementById(k).focus(); break; case 'input': return true; - case 'div': - case 'span': + case 'div': + case 'span': if(event.srcElement.parentElement) { switch(event.srcElement.parentElement.id) { case 'keyboards': - keyboard_checkclick(event.srcElement.id.substring(5),true); + keyboard_checkclick(event.srcElement.id.substring('list_keyboard_'.length),true); break; case 'options': - options_updatecheck(event.srcElement.id.substring(5),true); + options_updatecheck(event.srcElement.id.substring('list_option_'.length),true); break; - case 'hotkeys': - location.href='keyman:hotkey_set?index=hotkey_' + event.srcElement.id.substring(5); + case 'subcontent_hotkeys': + location.href='keyman:hotkey_set?index=hotkey_' + event.srcElement.id.substring('list_hotkey_'.length); break; default: break; @@ -124,13 +119,13 @@ } event.cancelBubble = true; event.returnValue = false; event.preventDefault(); break; break; - default: + default: for(var i = 0; i < menuframe_items.length; i++) if(menuframe_items[i].menu_hotkey.charCodeAt(0) == event.keyCode && event.altKey) { event.cancelBubble = true; event.returnValue = false; menuframe_activate(i); break; } - + } } @@ -138,5 +133,4 @@ document.onkeydown = menuframe_keydown; } doAttachEvent(window, 'load', menuframe_setup); - - \ No newline at end of file + diff --git a/oem/firstvoices/windows/src/xml/menu.css b/oem/firstvoices/windows/src/xml/menu.css index bf1dcdba94..b1b7bec882 100644 --- a/oem/firstvoices/windows/src/xml/menu.css +++ b/oem/firstvoices/windows/src/xml/menu.css @@ -1,6 +1,6 @@ /* Popup menu styles */ .menu -{ +{ white-space: nowrap; position: absolute; display: block; @@ -9,22 +9,23 @@ border: solid 1px #ACA899; font-size: 11px; padding: 4px; - background-image: url("menugrey.gif"); - background-repeat: repeat-y; + background-image: url("menugrey.gif"); + background-repeat: repeat-y; background-position: 0 0; width: 220px; z-index: 100; } .menuitem -{ - display: block; - padding: 4px 4px 4px 28px; +{ + display: block; + padding: 4px 4px 4px 28px; margin: 1px; + cursor: default; } - + .hover -{ +{ color: #000000; background: #FFE3DB; border: solid 1px #DB704F; @@ -32,6 +33,21 @@ } .down -{ - background: #DB704F; +{ + background: #DB704F; +} + +#menubackground { + position: fixed; + left: 0; + top: 0; + width: 100%; + height: 100%; + background: rgba(64,64,64,0.1); + display: none; +} + +#menubackground.show { + display: block; + z-index: 99; } diff --git a/oem/firstvoices/windows/src/xml/menu.js b/oem/firstvoices/windows/src/xml/menu.js index 5016042016..b120341d4c 100644 --- a/oem/firstvoices/windows/src/xml/menu.js +++ b/oem/firstvoices/windows/src/xml/menu.js @@ -55,12 +55,15 @@ var menudiv = null, global_menu_elem_name = null; q = menudiv.children[0]; q.focus(); + + document.getElementById('menubackground').className = 'show'; } function HideMenu() { if(event.srcElement != menudiv) { global_menu_elem_name = null; menudiv.style.visibility='hidden'; + document.getElementById('menubackground').className = ''; try { if(lastfocus_item != null) lastfocus_item.focus(); } catch(e) { diff --git a/oem/firstvoices/windows/src/xml/onlineupdate.xsl b/oem/firstvoices/windows/src/xml/onlineupdate.xsl index 2eeb2fbf23..931c0c106b 100644 --- a/oem/firstvoices/windows/src/xml/onlineupdate.xsl +++ b/oem/firstvoices/windows/src/xml/onlineupdate.xsl @@ -1,19 +1,22 @@ - + - + + + + <xsl:value-of select="$locale/string[@name='S_Update_Title']"/> + + + + @@ -26,12 +28,12 @@
- +
- +
@@ -40,20 +42,20 @@
- +
No keyboards loaded - Open Configuration
- +
- +
- +
diff --git a/oem/firstvoices/windows/src/xml/strings.xml b/oem/firstvoices/windows/src/xml/strings.xml new file mode 100644 index 0000000000..e585e05bab --- /dev/null +++ b/oem/firstvoices/windows/src/xml/strings.xml @@ -0,0 +1,1197 @@ + + + + + + + + + + Keyman + + + + + Segoe UI + + + + + 9 + + + + + + + + &Yes + + + + + &No + + + + + OK + + + + + Cancel + + + + + Close + + + + + OK + + + + + Cancel + + + + + Click this icon to select a keyboard + + + + + Keyman is still running. Click this icon to use your language keyboard at any time + + + + + Keyman for FirstVoices is already running. Click the Keyman for FirstVoices icon in the system notification area to use your language keyboard + + + + + Keyman for FirstVoices Configuration + + + + + Help + + + + + + + Keyboard Layouts + + + + + K + + + + + Options + + + + + O + + + + + Hotkeys + + + + + H + + + + + Support + + + + + S + + + + + Keep in Touch + + + + + T + + + + + + + + Filename: + + + + + Package version: + + + + + Keyboard version: + + + + + Author: + + + + + Website: + + + + + Package: + + + + + Fonts: + + + + + Keyboard Layouts: + + + + + Keyboard Layout: + + + + + Keyboard Language: + + + + + Encodings: + + + + + Layout Type: + + + + + Fixed (Positional) + + + + + Mapped to Windows layout (Mnemonic) + + + + + Languages: + + + + + + + + + + Add language + + + + + On Screen Keyboard: + + + + + Custom + + + + + Installed + + + + + Not installed + + + + + Documentation: + + + + + Installed + + + + + Not installed + + + + + Message: + + + + + Copyright: + + + + + Changes are applied immediately + + + + + Install keyboard... + + + + + Download keyboard... + + + + + Keyboard options + + + + + You do not have any keyboards installed. Click the Download Keyboard button to install a keyboard layout from the Keyman website. + + + + + + You can only uninstall the keyboard \'%1$s\' if you are an Administrator + + + + + Share keyboard + + + + + Scan this code to load this keyboard on another device or + + + + + share online + + + + + + + + + + + + General + + + + + Startup + + + + + On Screen Keyboard + + + + + Advanced + + + + + Keyboard hotkeys toggle keyboard activation + + + + + Simulate AltGr with Ctrl+Alt + + + + + Treat hardware deadkeys as plain keys + + + + + Show hint messages + + + + + Automatically report errors to keyman.com + + + + + Share anonymous usage statistics with keyman.com + + + + + Start when Windows starts + + + + + Show splash screen + + + + + Show welcome screen + + + + + Automatically check keyman.com weekly for updates + + + + + Test for conflicting applications when Keyman for FirstVoices starts + + + + + Release Shift/Ctrl/Alt on On Screen Keyboard after clicking a key + + + + + Always show On Screen Keyboard Window when a FirstVoices keyboard is selected + + + + + Switch to appropriate On Screen Keyboard/Help automatically when a keyboard is selected + + + + + Turn on Unicode supplementary character display (requires restart) + + + + + Turn on \'Unknown\' language + + + + + Debugging + + + + + Switch Windows language when a FirstVoices keyboard is selected + + + + + Select keyboard layout for all applications + + + + + Always elevate user permissions when running in Windows Vista + + + + + Base Keyboard... + + + + + + + + + + + + + + + + + (none) + + + + + Switch Keyman for FirstVoices Off + + + + + Open Keyboard Menu + + + + + Show On Screen Keyboard Pane + + + + + Open Configuration + + + + + Show Font Helper Pane + + + + + Show Character Map Pane + + + + + Open Text Editor + + + + + Open Language Switcher + + + + + General Hotkeys + + + + + Keyboard Layouts + + + + + + + If you have any issues using Keyman for FirstVoices, just ask a question on the FirstVoices Help Center. + + + + + Open FirstVoices Help Center + + + + + Created by SIL International + + + + + Copyright © SIL International. All Rights Reserved. + + + + + Version + + + + + Useful Links + + + + + Online Help + + + + + Check for Updates + + + + + Proxy Settings... + + + + + Keyman System Settings... + + + + + Diagnostics + + + + + + + Download Keyboard From keyman.com + + + + + Don\'t install, just download + + + + + + Unable to download keyboard, error %2$d: %1$s + + + + + < Back + + + + + + + Install Keyboard/Package + + + + + Details + + + + + Readme + + + + + Install + + + + + + + + Proxy Server Configuration + + + + + Server: + + + + + Port: + + + + + Username: + + + + + Password: + + + + + + + + Set Base Keyboard + + + + + Select the base Latin script +keyboard that you use in Windows. Keyman for FirstVoices will adapt automatically to your preferred layout. + + + + + + + + Change Hotkey + + + + + + Select a standard hotkey or choose \'Custom\' and hold Ctrl,Shift and/or Alt and type your desired hotkey for language %1$s: + + + + + Select a standard hotkey or choose \'Custom\' and hold Ctrl,Shift and/or Alt and type your desired hotkey: + + + + + + The hotkey %1$s will conflict with normal keyboard use. You should use at least Ctrl or Alt. Do you want to change this now\? + + + + + + The hotkey %1$s conflicts with the hotkey selected for keyboard %2$s. If you continue, the hotkey for keyboard %2$s will be cleared. Continue\? + + + + + + The hotkey %1$s conflicts with another hotkey. If you continue, the other hotkey will be cleared. Continue\? + + + + + + + + Updated Keyman for FirstVoices Components Available + + + + + Updates for Keyman for FirstVoices are now available + + + + + Please select the updates you wish to install: + + + + + You can download the new version from: + + + + + Install Now + + + + + Cancel + + + + + Old Version + + + + + Updated Component + + + + + Size + + + + + + Keyman for FirstVoices %1$s + + + + + + Keyboard %1$s %2$s + + + + + Unable to contact keyman.com - please make sure you have an active Internet connection and try again. + + + + + + Unable to contact keyman.com - please make sure you have an active Internet connection and try again. The error received was: %1$s + + + + + Keyman for FirstVoices updates are available + + + + + Click this icon to download and install updates + + + + + View and &install Keyman for FirstVoices updates + + + + + E&xit online update check + + + + + + + + Keyman for FirstVoices + + + + + Start Keyman for FirstVoices + + + + + Exit + + + + + Configuration + + + + + Show this screen at startup + + + + + + + + Display in + + + + + Find other display languages online... + + + + + Help translate the user interface... + + + + + English + + + + + English + + + + + en + + + + + en + + + + + Keyman for FirstVoices + + + + + + + + Reset Hints + + + + + All hint messages have been reset and will be displayed again. + + + + + + Exit Keyman for FirstVoices\? + + + + + + Are you sure you want to exit Keyman for FirstVoices\? Your FirstVoices keyboards will still be listed in the Windows languages, but will not be functional until you restart Keyman for FirstVoices. + + + + + + On Screen Keyboard Closed + + + + + + You have closed the On Screen Keyboard. Keyman for FirstVoices is still running. You can open the On Screen Keyboard at any time by clicking on the Keyman for FirstVoices Icon and selecting "On Screen Keyboard" + + + + + Don\'t show this hint again + + + + + + + + Keyman for FirstVoices Help + + + + + Help Contents + + + + + Help on " + + + + + " keyboard + + + + + View On Screen Keyboard + + + + + View Font Helper + + + + + View Character Map + + + + + Open Keyman for FirstVoices Configuration + + + + + Open Help + + + + + Close On Screen Keyboard + + + + + + + + Switch Keyman for FirstVoices &Off + + + + + On Screen &Keyboard + + + + + &Font Helper + + + + + Character &Map + + + + + &Text Editor... + + + + + &Configuration... + + + + + &Help... + + + + + E&xit + + + + + Fade When Inactive + + + + + Show Toolbar + + + + + Save as Web Page... + + + + + Print... + + + + + + + + Keyman for FirstVoices + + + + + + Version %1$s + + + + + &Print... + + + + + + + + A package with the name %1$s is already installed. Do you want to uninstall it and install the new one\? + + + + + + A keyboard with the name \'%1$s\' is already installed. If you continue, it will be uninstalled before the new one is installed. Continue\? + + + + + + The keyboard \'%1$s\' is part of package \'%2$s\'. You must uninstall the entire package. Continue\? + + + + + + Unable to install keyboard language; Windows has a limit of 4 custom \'transient\' languages, and you may have reached this limit. + + + + + + The package or keyboard \'%1$s\' does not include any introductory help. + + + + + This operating system is not supported. + + + + + KeymanDesktop.chm + + + + + The help file could not be found. + + + + + Codepage + + + + + Unicode + + + + + Downloading File + + + + + + + + + Are you sure you want to remove the on screen keyboard installed for %1$s\? + + + + + + Are you sure you want to uninstall keyboard %1$s\? + + + + + + Are you sure you want to uninstall package %1$s\?\n\n%2$s + + + + + + The following fonts will also be uninstalled: %1$s. + + + + + The Character Map has a database of characters that needs to be built before it can be used. Build it now\? + + + + + + + + + The Unicode Character database could not be deleted for a rebuild. Error details are: %1$s + + + + + + The Unicode Character database could not be created and has been disabled. Error details are: %1$s + + + + + + The Unicode character database did not load successfully (%1$s). Rebuild it now\? + + + + + + + Keyman for FirstVoices failed to start. Please check your security settings to make sure that the program keyman.exe is allowed to start before continuing. The error returned was:\n\n"%1$s"\n\nDo you want to try and start Keyman for FirstVoices again now\? + + + + + + + Keyman debug information will be stored in a log file called %LOCALAPPDATA%\Keyman\Diag\system#.etl (where # is a number). You should exit Keyman for FirstVoices before attempting to delete this file.\n\n\WARNING: This file can grow large very quickly. Enabling debugging may slow down your system and should only be done if advised by technical support.\n\nPRIVACY WARNING: Please note that the debug logfile records all keystrokes that you type. You should only turn on the debug log for the duration of a debugging or diagnostic session. + + + + + + + + Please wait while searching for related fonts for keyboard %1$s + + + + + Keyboard %1$s is not a Unicode keyboard. Fonts cannot be automatically located. Please check the keyboard documentation for font information. + + + + + No keyboard layouts are currently installed or loaded. + + + + + Please select a FirstVoices keyboard to find related fonts. + + + + + + + Text Editor - Keyman for FirstVoices + + diff --git a/oem/firstvoices/windows/src/xml/vkhints.xsl b/oem/firstvoices/windows/src/xml/vkhints.xsl deleted file mode 100644 index e165b706d9..0000000000 --- a/oem/firstvoices/windows/src/xml/vkhints.xsl +++ /dev/null @@ -1,184 +0,0 @@ - - - - - - - - - - - - - hintbar - - - - -
-
-
- - -
-
-
-
-
- - - iconcharmapicon.gif - - -
-
- - - iconfonthinticon.gif - - -
-
- - - iconkeyboardhelpicon.gif - - -
-
-
-
- - -
-
diff --git a/oem/firstvoices/windows/src/xml/welcome_fonts.xsl b/oem/firstvoices/windows/src/xml/welcome_fonts.xsl index a812594091..ab3780a854 100644 --- a/oem/firstvoices/windows/src/xml/welcome_fonts.xsl +++ b/oem/firstvoices/windows/src/xml/welcome_fonts.xsl @@ -8,11 +8,11 @@ - - + + fonts