From a31db9777a2d5560074a2bfa452dc8c0aac5bd3f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?m=C3=B6si?= Date: Fri, 13 Feb 2009 18:32:57 +0000 Subject: =?UTF-8?q?Gui=20statt=20MsgBox=20Deutsche=20Bezeichnungen=20f?= =?UTF-8?q?=C3=BCr=20die=20diakritischen=20Tasten?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit git-svn-id: https://svn.neo-layout.org@1660 b9310e46-f624-0410-8ea1-cfbb3a30dc96 --- windows/neo-vars/src/source/shortcuts.ahk | 20 ++++++++--------- windows/neo-vars/src/source/tools.ahk | 36 ++++++++++++++++++++----------- 2 files changed, 34 insertions(+), 22 deletions(-) diff --git a/windows/neo-vars/src/source/shortcuts.ahk b/windows/neo-vars/src/source/shortcuts.ahk index 8a08281..cc9f2ef 100644 --- a/windows/neo-vars/src/source/shortcuts.ahk +++ b/windows/neo-vars/src/source/shortcuts.ahk @@ -236,16 +236,16 @@ CBS__M8 := "Mod8=Shift+Mod3+Mod4+" CBSComp := "Compose" CBTAcut := "Akut" -CBTgrav := "Grave" -CBTcedi := "Cedilla" -CBTabdt := "Abovedot" +CBTgrav := "Gravis" +CBTcedi := "Cedille" +CBTabdt := "Punkt darüber" CBTogon := "Ogonek" -CBTcflx := "Circumflex" -CBTcron := "Caron" +CBTcflx := "Zircumflex" +CBTcron := "Hatschek" CBTbrve := "Breve" -CBTbldt := "Belowdot" +CBTbldt := "Punkt darunter" CBTtlde := "Tilde" -CBTmcrn := "Macron" -CBTdrss := "Diaeresis" -CBTdbac := "Doubleacute" -CBTstrk := "Stroke" \ No newline at end of file +CBTmcrn := "Makron" +CBTdrss := "Trema" +CBTdbac := "Doppelakut" +CBTstrk := "Schrägstrich" \ No newline at end of file diff --git a/windows/neo-vars/src/source/tools.ahk b/windows/neo-vars/src/source/tools.ahk index 38a42ee..835ef1e 100644 --- a/windows/neo-vars/src/source/tools.ahk +++ b/windows/neo-vars/src/source/tools.ahk @@ -514,7 +514,10 @@ SetFormat,Integer,h SetFormat,Integer,d a := "U" . substr("0000" . substr(a,3),-3) - wmn := "Das Zeichen " . a . " kann wie folgt eingegeben werden:`r`n" + Gui,2:Destroy + Gui,2:Font,,DejaVu Sans + Gui,2:Margin,10,0 + Gui,2:Add,Text,,% "`r`nDas Zeichen " . a . " kann wie folgt eingegeben werden:" loop,parse,CRC%a%,%A_Space% { this_wmn := "" @@ -545,23 +548,32 @@ SetFormat,Integer,d this_wmn := SubStr(this_wmn,2) if (this_wmnk != "") this_wmnk := SubStr(this_wmnk,2) + Gui,2:Font,,Dejavu Sans Bold if (nthis == 1) - wmn .= "Wegen fehlender Tastenbelegung: Nicht als Compose:`r`n" + Gui,2:Add,Text,,% "Wegen fehlender Tastenbelegung nicht als Compose:" else - wmn .= "Als Compose:`r`n" - wmn .= this_wmn . "`r`noder`r`n" . this_wmnk . "`r`n`r`n" + Gui,2:Add,Text,,% "Als Compose:" + Gui,2:Font,,Dejavu Sans + Gui,2:Add,Text,,% this_wmn . "`r`noder`r`n" . this_wmnk } wmnk := KeyLong(CRK%a%) - if (wmnk != "") - wmn .= "Als Tastendruck:`r`n" . wmnk - else - wmn .= "Als Tastendruck nicht verfügbar!" + Gui,2:Font,,Dejavu Sans Bold + if (wmnk != "") { + Gui,2:Add,Text,,% "Als Tastendruck:" + Gui,2:Font,,Dejavu Sans + Gui,2:Add,Text,,% wmnk + } else + Gui,2:Add,Text,,% "Als Tastendruck nicht verfuegbar" - if (wmn != "") - MsgBox,0,Wie mit NEO,% wmn - else - TrayTip,Wie mit NEO,Keine Information über %a% gefunden,10,1 + Gui,2:Add, Button, Default xp+100 yp+40, OK + Gui,2:Show + return + + 2ButtonOK: + 2GuiEscape: + Gui,2:Destroy + return } KeyLong(key) { -- cgit v1.2.3