Changeset 2085

Timestamp:

08/17/12 09:07:14 (9 months ago)

Author:

tsv

Message:

tsvstar-ui: merge from trunk 2073-2082

Location:

branches/tsvstar-uitest

Files:

• CHDK/LANG/croatian.lng (modified) (6 diffs)
• CHDK/LANG/czech.lng (modified) (11 diffs)
• CHDK/LANG/english.lng (modified) (1 diff)
• CHDK/LANG/german.lng (modified) (1 diff)
• CHDK/SCRIPTS/EDITOR/EDI.lua (modified) (24 diffs)
• CHDK/SCRIPTS/EDITOR/README.TXT (modified) (5 diffs)
• core/conf.c (modified) (1 diff)
• core/gui.c (modified) (5 diffs)
• core/gui_lang.h (modified) (1 diff)
• core/gui_menu.c (modified) (6 diffs)
• core/gui_osd.c (modified) (2 diffs)
• core/gui_user_menu.c (modified) (4 diffs)
• include/conf.h (modified) (1 diff)
• platform/a580/notes.txt (modified) (2 diffs)
• platform/a580/platform_camera.h (modified) (1 diff)
• platform/ixus100_sd780/kbd.c (modified) (3 diffs)
• platform/ixus100_sd780/notes.txt (modified) (1 diff)
• platform/ixus100_sd780/platform_camera.h (modified) (1 diff)
• platform/ixus105_sd1300/kbd.c (modified) (6 diffs)
• platform/ixus105_sd1300/lib.c (modified) (3 diffs)
• platform/ixus105_sd1300/notes.txt (modified) (1 diff)
• platform/ixus105_sd1300/platform_camera.h (modified) (4 diffs)
• platform/ixus105_sd1300/sub/100d/boot.c (modified) (6 diffs)
• platform/ixus105_sd1300/sub/100d/capt_seq.c (modified) (2 diffs)
• platform/ixus105_sd1300/sub/100d/lib.c (modified) (1 diff)
• platform/ixus105_sd1300/sub/100d/stubs_auto.S (modified) (1 diff)
• platform/ixus105_sd1300/sub/100d/stubs_entry.S (modified) (6 diffs)
• platform/ixus105_sd1300/sub/100d/stubs_entry_2.S (modified) (1 diff)
• platform/ixus300_sd4000/kbd.c (modified) (3 diffs)
• platform/ixus300_sd4000/notes.txt (modified) (1 diff)
• platform/ixus300_sd4000/platform_camera.h (modified) (1 diff)
• platform/s100/platform_camera.h (modified) (1 diff)

branches/tsvstar-uitest/CHDK/LANG/croatian.lng

@@ -12 +12 @@
   5 "Zebra parametri"
   6 "Parametri skripti"
-  7 "Postavke izgleda"
+  7 "Boje"
   8 "Razno"
   9 "Debug parametri"
@@ -71 +71 @@
  
  
- 49 "Postavke izgleda"
+ 49 "Boje"
  
  50 "Jezik..."
@@ -475 +475 @@
 369 "Odaberi datoteku krivulja"
 
-370 "Crtanje rubova"
-371 "Crtanje rubova"
+370 "Panorama-crtanje rubova"
+371 "Panorama-crtanje rubova"
 
 372 "Omoguæi crtanje rubova"
@@ -533 +533 @@
 
 421 "Uèitaj+postavke Zooma"
-422 "Zakljuèaj crtanje rubova"
+422 "Panorama"
 423 "Bljesak na zadnju lamelu"
 424 "DNG format"
@@ -546 +546 @@
 433 "Jesam te"
 434 "Neriješeno"
-435 "Onemoguæi Raw u crtanju rubova"
+435 "Onemoguæi Raw u Panorami"
 436 "Onemoguæi Raw u Auto modu"
 437 "   SAMO u videu"
@@ -672 +672 @@
 
 551 "Omoguæi'start skripte'"
+
+552 "Onemoguæi ZOOM dugme"
+
+553 "DNG verzija"
+554 "Postavke izbornika"
+555 "<ALT> pomoæni prozor"
+556 "Pomoæni prozor-odgoda"
+557 "CHDK postavke"
+
+// <ALT> mode help screen text
+558 "%-20s %-14s"                           // Header format, adjust if needed; but total len must be 35
+559 "<ALT> kratice"                       // Len must be <= first string in header format (20)
+560 "Shutter Half Press +"                  // Len must be <= first string in header format (20)
+561 "MENU=CHDK Menu"                        // Len must be <= second string in header format (14)
+562 "MENU=User Menu"                        // Len must be <= second string in header format (14)
+563 "SET=Script Menu, SHUTTER=Run Script"   // Len must be <= 35
+564 "Focus  %5s=Inf.  %5s=HyperFocal"       // Len must be <= 35
+565 "Manual Focus"
+566 "Hide CHDK OSD while pressed"
+567 "  * - nedostupno u <ALT> modu  "   // Len must be <= 35
+
+568 "'%s'\ndodano u korisnièki izbornik"
+569 "Korisnièki izbornik je pun"
+
+570 "SD kartica"
+571 "Jezik i font"
+
+//
+572 "Bljeskalica (snaga)"
+573 "Brzi EV korak"
+574 "Prikaži pomoæni prozor"
+575 "Koristi popup za ureðivanje"
+
+576 "Dodaj skriptu u korisnièki izbornik"
+
+577 "Lijevo, Desno & Jogdial = Vrijednost"
+578 "Zoom = Odabir faktora"
+579 "SET  = Potvrdi, DISP = Odbaci"
+580 "MENU = Uklj./Isklj."
+
+581 "Beskrajan fokus"
+582 "Fokus faktor"

branches/tsvstar-uitest/CHDK/LANG/czech.lng

@@ -7 +7 @@
   1 "Hlavní menu"
 
-  2 "Nastavení pro formát RAW"
-  3 "Nastavení parametru OSD"
-  4 "Nastavení histogramu"
-  5 "Nastavení zebry"
-  6 "Nastavení skriptu"
-  7 "Nastavení zobrazení"
-  8 "Ruzné"
-  9 "Debugger (ladení programu)"
- 10 "Obnovit výchozí nastavení..."
- 11 "Uložit nastavení..."
-
- 12 "Zpet"
+  2 "RAW (digitální negativ)"
+  3 "Nastavení OSD"
+  4 "Histogram (graf expozice)"
+  5 "Zebra (zobrazení pøe/pod exponování)"
+  6 "Skript (programování foáku)"
+  7 "Nastavení barev"
+  8 "Rùzné vìci"
+  9 "Parametry ladìní"
+ 10 "Obnovit nastavení na výchozí..."
+ 11 "Uložit nastavení nyní..."
+
+ 12 "Zpìt"
 
 
  13 "RAW"
 
- 14 "Ukládat ve formátu RAW"
- 15 "Sloucit dlouhodob. expozici"
- 16 "Pouze první RAW v sérii snímku"
- 17 "RAW soubor v adresári s JPEG"
- 18 "Prefix RAW souboru "
- 19 "Prípona RAW souboru"
+ 14 "Ukládat RAW"
+ 16 "Pouze první RAW v sérii"
+ 17 "Soubor RAW v adresáøi s JPEG"
+ 18 "Prefix souboru RAW"
+ 19 "Pøípona souboru RAW"
 
 
@@ -35 +34 @@
  21 "Zobrazit OSD"
  22 "Zobrazit stav"
- 23 "Zobrazit nastavení objektivu"
- 24 "Zoom"
+ 23 "Zobrazit rùzné hodnoty"
+ 24 " Hodnota pøiblížení"
  25 "Zobrazit DOF kalkulátor"
  26 "Zobrazit hodiny"
- 27 "Nastavit rozmístení prvku na OSD"
+ 27 "Editor rozvržení prvkù OSD"
  28 "Baterie"
 
@@ -46 +45 @@
 
  30 "Zobr. živý histogram"
- 31 "Struktura histogramu"
+ 31 "Rozvržení histogramu"
  32 "Režim histogramu"
- 33 "Zobr. v histogr. pre/pod EXP"
- 34 "Ignorov. hranic. špicky"
+ 33 "Zobr. v histogr. pøe/pod EXP"
+ 34 "Ignorovat hranièní špièky"
  35 "Automatická velikost"
 
@@ -56 +55 @@
 
  37 "Vykreslovat zebru"
- 38 "Mód zebry"
+ 38 "Režim zebry"
  39 "Práh podexponování"
- 40 "Práh preexponování"
- 41 "Obnovit výchozí zobrazení"
+ 40 "Práh pøeexponování"
+ 41 "Obnovit pùvodní obrazovku"
  42 "Obnovit OSD"
- 43 "Kreslit pres zebru"
+ 43 "Kreslit pøes zebru"
 
 
  44 "Skripty"
 
- 45 "Otevrít skript ze souboru..."
- 46 "Spoždení zahájení skriptu (.1s)"
+ 45 "Naèíst skript ze souboru..."
+ 46 "Prodleva zahájení skriptu (.1s)"
  47 "Aktuální skript"
  48 "Parametry skriptu"
 
 
- 49 "Nastavení zobrazení"
+ 49 "Nastavení barev"
 
  50 "Jazyk..."
- 51 "Kód. stránka"
- 52 "RBF font menu..."
+ 51 "Kódová stránka OSD"
+ 52 "RBF písmo menu..."
  53 "Barvy"
  54 "OSD - text"
@@ -83 +82 @@
  57 "Histogram - pozadí"
  58 "Histogram - okraj"
- 59 "Histogram - EXP znacky"
+ 59 "Histogram - EXP znaèky"
  60 "Zebra - podexponování"
- 61 "Zebra - preexponování"
- 62 "Ikona baterie"
+ 61 "Zebra - pøeexponování"
+ 62 "Baterie - ikona"
  63 "Menu - text"
  64 "Menu - pozadí"
- 65 "Prohlížec textu - text"
- 66 "Prohlížec textu - pozadí"
-
-
- 67 "Ruzné"
-
- 68 "Prohlížec souboru"
- 69 "Kalendár"
- 70 "Prohlížec textu"
+ 65 "Prohlížeè textù - text"
+ 66 "Prohlížeè textù - pozadí"
+
+
+ 67 "Rùzné"
+
+ 68 "Prohlížeè souborù"
+ 69 "Kalendáø"
+ 70 "Prohlížeè textových souborù"
  71 "Hry"
  72 "Baterka"
- 73 "Ukázat splash po zavedení"
- 74 "Použít zoom-pácku pro MF"
- 75 "Tlacítko <ALT> módu"
- 76 "Vykreslení palety"
- 77 "Informace o programu"
- 78 "Informace o pameti"
-
-
- 79 "Debug"
-
- 80 "Ukázat PropCases"
- 81 "Stránka PropCase"
- 82 "Ukázat ladící hodnoty"
- 83 "Prohlížení pameti"
- 84 "Výpis RAM pri ALT +/- stisku"
- 85 "Vytvorit bootovací kartu..."
-
-
- 86 "Baterie a místo na karte"
-
- 87 "Napetí MAX (mV)"
- 88 "Napetí MIN (mV)"
- 89 "Krokovat po 25"
- 90 "Zobrazovat procenta"
- 91 "Zobrazovat napetí"
- 92 "Zobrazovat ikonu"
-
-
- 93 "Prohlížec textu"
-
- 94 "Otevrít nový soubor..."
- 95 "Otevrít naposledy otevrený"
- 96 "Vybrat RBF font"
+ 73 "Zobr. úvod. obraz.@naètení"
+ 74 "Použít páèky pøiblíž. pro MF"
+ 75 "Tlaèítko režimu <ALT>"
+ 76 "Vykreslit paletu"
+ 77 "Zobrazit inf. o sestavení"
+ 78 "Zobrazit inf. o pamìti"
+
+
+ 79 "Ladìní"
+
+ 80 "Zobrazit data ladìní"
+ 81 "Stránka PropCase/ParamsData"
+ 82 "Zobrazit rùzné hodnoty"
+ 83 "Prohlížeè pamìti"
+ 84 "Akce ladìní ALT +/-"
+ 85 "Vytvoøit bootovací kartu..."
+
+
+ 86 "Nastavení zobrazení baterie"
+
+ 87 "MAX napìtí baterie (mV)"
+ 88 "MIN napìtí baterie (mV)"
+ 89 "Velikost kroku (ON= 25, OFF= 1 mV)"
+ 90 "Zobr. procenta baterie"
+ 91 "Zobr. napìtí baterie"
+ 92 "Zobr. ikonu baterie"
+
+
+ 93 "Prohlížeè textových souborù"
+
+ 94 "Otevøít nový soubor..."
+ 95 "Otevøít naposledy otevøený"
+ 96 "Vybrat RBF písmo"
  97 "Kódová stránka"
- 98 "Zalamovat slova"
+ 98 "Zalamovat podle slov"
  99 "Povolit aut. posouvání"
 100 "Prodleva aut. posouvání (s)"
@@ -145 +144 @@
 
 
-104 "*** Výchozí nastavení ***"
-
-105 "Opravdu vrátit nastavení na výchozí hodnoty?"
-
-106 "*** Informace o programu ***"
-107 "CHDK Ver: %s, #%s\nDatum:    %s\nCas:    %s\nPrístr:  %s\nFW Ver: %s\nCompiler: %s"
-
-108 "*** Informace o pameti ***"
-109 "Volná pamet: %d bytu"
+104 "*** Obnovit nastavení ***"
+105 "OPRAVDU obnovit nastavení\nna výchozí hodnoty?"
+
+106 "*** Informace o sestavení ***"
+107 "Verze CHDK: %s %s\nRevize:     %s\nDatum:      %s\nÈas:        %s\nFoák:      %s\nVerze FW:   %s\nKompilér:   %s"
+
+108 "*** Informace o pamìti ***"
+109 "Volná pamì: %d bajtù\nVelikost CHDK: %d bajtù\nNaèteno na: 0x%X"
 
 110 "*** Informace ***"
-111 "Prosím prepnete prístroj\ndo PLAY módu\na zkuste to znovu. :)"
+111 "Prosím pøepnìte foák\ndo režimu PROHL͎ENÍ\na zkuste to znovu. :)"
 
 // file browser titles
-112 "Prohlížec souboru"
-113 "Výber souboru skriptu"
-114 "Výber textového souboru"
-115 "Výber RBF-font souboru"
-116 "Výber souboru jazyka"
+112 "Prohlížeè souborù"
+113 "Vybrat soubor skriptu"
+114 "Vybrat soubor textu"
+115 "Vybrat soubor RBF písma"
+116 "Vybrat soubor jazyka"
 
 // for calendar
 117 "Leden"
 118 "Únor"
-119 "Brezen"
+119 "Bøezen"
 120 "Duben"
-121 "Kveten"
-122 "Cerven"
-123 "Cervenec"
+121 "Kvìten"
+122 "Èerven"
+123 "Èervenec"
 124 "Srpen"
-125 "Zárí"
-126 "Ríjen"
+125 "Záøí"
+126 "Øíjen"
 127 "Listopad"
 128 "Prosinec"
 
 129 " Po"
-130 " Ut"
+130 " Út"
 131 " St"
-132 " Ct"
+132 " Èt"
 133 " Pá"
 134 " So"
@@ -193 +191 @@
 138 "Ano"
 139 "Ne"
-140 "Zrušit"
+140 "Storno"
 
 // OSD layout editor
 141 "Histogram"
-142 "DOF kalk."
-143 "RAW/SCR/EXP"
-144 "Soubor hodnot"
+142 "DOF kalkulátor"
+143 "Zobrazení stavù"
+144 "Rùzné hodnoty"
 145 "Ikona baterie"
 146 "Text baterie"
@@ -205 +203 @@
 
 // palette
-148 " Stiskni SET pro vykreslení barvy "
-149 "     Stiskni MENU pro ukoncení    "
+148 "Stisknìte SET pro vykreslení barvy "
+149 "     Stisknìte MENU pro ukonèení"
 150 "Barva"
-151 "%s pro výber barvy"
+151 "Použijte %s pro výbìr barvy"
 
 // reversi
 152 "*** Výsledek hry ***"
-153 "Vyhrál jsi! :)"
-154 "Prohrál jsi! :("
+153 "Vyhrál jste! :)"
+154 "Prohrál jste! :("
 155 "Remíza! :/"
 
@@ -220 +218 @@
 158 "Toto pole není prázdné!"
 
-159 "Na tahu: Ty     "
-160 "Na tahu: Pocítac"
-161 "  KONEC  "
-162 " Bílá  Cerná "
-
-163 "*** O hre ***"
+159 "Na tahu: Ty   "
+160 "Na tahu: PC   "
+161 "    KONEC     "
+162 " Bílá   Èerná "
+
+163 "*** O høe ***"
 
 // sokoban
-164 "Obtížnost"
-165 "     Tahy"
-166 "*** K O N E C ***"
-167 "Skvele!\n  zvládl jsi to!  "
+164 " Úroveò"
+165 " Tahy"
+166 "*** Konec ***"
+167 "ANO!\n  Zvládl jste to!  "
 
 // console
-168 "*** SPUŠTEN  ***"
-169 "*** PRERUŠEN ***"
-170 "*** UKONCEN  ***"
+168 "*** SPUŠTÌN  ***"
+169 "*** PØERUŠEN ***"
+170 "*** UKONÈEN  ***"
 
 // file browser
-171 "*** Vymazat adresár ***"
-172 "Opravdu smazat\nVŠECHNY soubory \nz vybraného adresáre?"
+171 "*** Vymazat adresáø ***"
+172 "OPRAVDU smazat\nVŠECHNY soubory\nz vybraného adresáøe?"
 173 "*** Vymazat soubor ***"
 174 "OPRAVDU vymazat\nvybraný soubor?"
 
 // benchmark
-175 "Výkonostní testy"
-176 "Výpocet..."
-177 "Testování  stisknete [set] pro zahájení"
+175 "Výkonnostní testy"
+176 "Výpoèet..."
+177 "Testování foáku   Stisknìte [SET] pro start"
 178 "Obrazovka"
-179 "Zápis        :"
-180 "Ctení        :"
-181 "Pamet"
-182 "Flash-karta"
+179 "Zápis       :"
+180 "Ètení       :"
+181 "Pamì"
+182 "Karta"
 183 "Zápis (RAW) :"
 184 "Zápis (Mem) :"
 185 "Zápis (64k) :"
-186 "Ctení (64k) :"
+186 "Ètení (64k) :"
 
 187 "Zakázat vypnutí LCD"
@@ -264 +262 @@
 190 "Vložit"
 191 "Smazat"
-192 "Inverze výberu"
-193 "*** Vyjmutí souboru ***"
-194 "Opravdu vyjmout\n%d vybraných souboru\nz %s/?"
-195 "*** Kopírování souboru ***"
-196 "Opravdu kopírovat\n%d vybraných souboru\nz %s/?"
-197 "*** Mazání souboru ***"
-198 "Opravdu vymazat\n%d vybraných souboru?"
+192 "Inverzní výbìr"
+193 "*** Vyjmutí souborù ***"
+194 "OPRAVDU vyjmout\n%d vybraných souborù\nz %s/?"
+195 "*** Kopírování souborù ***"
+196 "OPRAVDU kopírovat\n%d vybraných souborù\nz %s/?"
+197 "*** Mazání souborù ***"
+198 "OPRAVDU vymazat\n%d vybraných souborù?"
 199 "Moment prosím..."
 
-200 "Zobrazovat mrížku"
-201 "Otevrít mrížku ze souburu..."
-202 "Cáry"
-203 "Mrížka"
-204 "Výber souboru s mrížkou"
-205 "Aktuální mrížka"
+200 "Zobrazit èáry møížky"
+201 "Naèíst møížku ze souboru..."
+202 "Èáry møížky"
+203 "Møížka"
+204 "Vybrat soubor s møížkou"
+205 "Aktuální møížka"
 
 206 "Redukce šumu"
 
-207 "Potlacit barvy mrížky"
-208 "Barva car"
-209 "Barva výplne"
+207 "Potlaèit barvy møížky"
+208 "Barva èar"
+209 "Barva výplnì"
 
 210 "DOF kalkulátor"
 211 "DOF kalkulátor"
-212 "Canon subj.vzd. jak pred.rov.ostr." 
-213 "Použít EXIF subj. vzdál. (PC65)"
-214 "Zobr. subj. vzdál. ve smíš."
-215 "Zob. prední rov.ostr. ve smíš."
-216 "Zob. zadní rov.ostr. ve smíš."
-217 "Zob. hyperf.vzdál. ve smíš."
-218 "Zob. hloub. ostr. ve smíš."
-
-
-219 "Smíšené hodnoty"
-220 "Smíšené hodnoty"
-221 "Zobr. v módu náhledu"      
-222 "Zobrazit zoom"             
-223 "Zobrazit 'skutecná' clona"
-224 "Zobrazit 'skutecné' ISO"
-225 "Zobrazit 'Market' ISO"
-226 " Zobr. ISO jen pri nast. autom. ISO"
+212 "Canon subj. vzd. jako pøed.rov.ostr." 
+213 "Použít subj. vzdál. EXIF(PC65)"
+214 "Zobr. subj. vzdál. v rùz."
+215 "Zobr. pøední rov. ostr. v rùz."
+216 "Zobr. zadní rov. ostr.  v rùz."
+217 "Zobr. hyperf. vzdál.  v rùz."
+218 "Zobr. hloub. ostr.  v rùz."
+
+
+219 "Rùzné hodnoty"
+220 "Rùzné hodnoty"
+221 "Zobr. v režimu náhledu"
+222 "Zobrazit pøiblížení"
+223 "Zobrazit 'skuteènou' clonu"
+224 "Zobrazit 'skuteèné' ISO"
+225 "Zobrazit 'market' ISO"
+226 "Zobr. ISO jen pøi režimu AutoISO"
 227 "Zobr. nast. expozice Ev (Tv+Av)"
-228 "Zobr. namerené Ev (Bv+Sv)"
+228 "Zobrazit namìøené Ev (Bv+Sv)"
 229 "Zobr. nastav. Bv (hod. jasu)"
-230 "Zobrazit namerené Bv"
-231 "Zobr. hodn. preexp. (ne blesk!)"
-232 "Zobr. jas scény"
-
-233 "Nastavení videa"
-234 "Nastavení videa"
-235 "Video mód"
+230 "Zobrazit namìøené Bv"
+231 "Zobr. hodn. pøeexp. (ne blesk!)"
+232 "Zobrazit jas scény"
+
+233 "Parametry videa"
+234 "Parametry videa"
+235 "Režim videa"
 236 "Datový tok videa"
 237 "Kvalita videa"
 
 
-238 "Rozšírené možnosti"
-239 "Rozšírené možnosti"
-240 "Prekrytí rychlosti záverky"
-241 "         koeficient"
-242 "Prekrytí hodnoty clony"
-243 "Prekrytí hodnoty ISO"
-244 "         koeficient"
-245 "Prekrytí subj. vzdál."
-246 "      koeficient (mm)"
-
-247 "Brack. v souvis. režimu"
-248 "Bracketing v souvisl. režimu"
+238 "Rozšíøené možnosti focení"
+239 "Rozšíøené možnosti focení"
+240 "Potlaèit rychlost závìrky"
+241 " "
+242 "Potlaèit hodnotu clony"
+243 "Potlaèit hodnotu ISO"
+244 " "
+245 "Potlaèit hodn. subj. vzdál. (mm)"
+246 " "
+
+247 "Bracketing v souvis. režimu"
+248 "Bracketing v souvis. režimu"
 249 "Hodnota TV Bracketingu"
 250 "Hodnota AV Bracketingu"
 251 "Hodnota ISO Bracketingu"
-252 "         koeficient"
-253 "Subj. rozestup Bracketu(MF)"
-254 "         koeficient (mm)"
+252 " "
+253 "Subj. hodn. rozestupu Bracketu (mm)"
+254 " "
 255 "Typ Bracketingu"
 
 256 "Autostart"
-257 "Povolit dálk. ovládání (USB)"
-
-258 "Rízení expozice (bez blesku)"
-259 "Rízení expozice (bez blesku)"
-260 "Prepocítat expozici"
-261 "TV expozice - prepoc. por."
-262 "AV expozice - prepoc. por."
-263 "ISO expozice - prepoc. por."
-
-264 "Vymazat hodn. prekr. pri spušt."
-
-265 "Zobr. hodn. 'Canon' preexp."
+257 "Povolit dálk. ovládání"
+
+258 "Øízení expozice (ne blesk)"
+259 "Øízení expozice (ne blesk)"
+260 "Pøepoèítat expozici"
+261 "TV expozice - pøepoè. poø."
+262 "AV expozice - pøepoè. poø."
+263 "ISO expozice - pøepoè. poø."
+
+264 "Smazat hodn. potlaèení@spušt."
+
+265 "Zobr. hodn. 'Canon' pøeexp."
 
 266 "Zpracování RAW"
-267 "Prosím prepnete fotoaparát\ndo režimu focení a zhotovte\njednu fotografii."
-268 "Výber RAW souboru"
+267 "Prosím pøepnìte fotoaparát\ndo režimu záznamu a zhotovte\njednu fotografii."
+268 "Vybrat soubor RAW"
 269 "RAW suma"
-270 "RAW prumer"
-271 "Nedostatek místa na karte:\n%dM požadováno, %dM k dispozici."
-
-272 "Zobrazit OSD v módu náhledu"
-273 "Spuštení seznamu úkolu"
-274 "Subj. vzdál od cocek"
-
-275 "Vymaz. hodn. bracketu & spušt."
-
-276 "Vytvorit kartu se dvema oddíly"
-277 "Prepnout oddíly"
-278 "Tímto se ZNICÍ VŠECHNA DATA\nna karte. Pokracovat?"
+270 "RAW prùmìr"
+271 "Nedostatek místa na kartì:\n%dM požadováno, %dM k dispozici."
+
+272 "Zobrazit OSD v režimu náhledu"
+273 "Spuštìní seznamu úkolu"
+
+274 "Subj. vzdál od èoèek"
+
+275 "Smazat hodn. bracketu@spušt."
+
+276 "Vytvoøit kartu se dvìma oddíly"
+277 "Pøepnout oddíly"
+278 "Tímto se ZNIÈÍ VŠECHNA DATA\nna kartì. Pokraèovat?"
 279 "Tato karta má pouze jeden oddíl"
 280 "Chyba"
 281 "Varování"
 282 "Informace"
-283 "RGB zebra (pouze preexp.)"
+283 "RGB zebra (pouze pøeexp.)"
 
 284 "Stav ND filtru"
 
-285 "Zobr. mrížku v histogramu"
-
-286 "OSD varování"
-287 "OSD pozadí varování"
+285 "Zobr. møížku Ev v histogramu"
+
+286 "OSD - varování"
+287 "OSD - pozadí varování"
 288 "Barva ikony zbýv. místa"
-289 "Zobr. ikonu místa na karte"
+289 "Zobr. ikonu místa na kartì"
 290 "Zbývající místo"
-291 "Zobr. místo na karte v proc."
-292 "Zobr. místo na karte v MB"
-293 "Prostor Text"
-294 "  Zobrazit pocet zbýv. RAW"
+291 "Zobr. místo na kartì v proc."
+292 "Zobr. místo na kartì v MB"
+293 "Text místa"
+294 "  Zobr. poèet snímkù RAW"
 295 "Zbývající pro RAW"
 
 296 "Zobrazit stav RAW"
 
-297 "Zobraz. hodnot pri videu"
-
-298 "    Druh koef. záverky"
-299 "Uživatel. menu aktivní"
+297 "Zobr. hodnoty pøi videu"
+
+298 " "
+299 "Povolit uživatel. menu"
 300 "Uživatelské menu"
-301 " "
-
-302 " Zvetš. cocky adapt., 100=1x"
+
+302 " Mìøítko èoèky adaptéru, 100=1x"
 303 "Zobr. indikát. místa"
-304 "  Velikost na display"
+304 "  Velikost na obraz."
 305 "  Šírka/Výška"
-306 "  Prah. limit v %"
-307 "  Prah. limit v MB"
+306 "  Práh limitu v %"
+307 "  Práh limitu v MB"
 308 "Jednotka varování"
-309 "  Prahov. limit varování"
-310 "Povolit optický ZOOM"
+309 "  Práh limitu varování"
+310 "Povolit optické pøiblížení"
 311 "Hodiny"
 312 "Nastavení hodin"
 313 "Formát hodin"
 314 "Barva pozadí zbývajícího místa"
-315 "Indikace 12h casu "
-316 "Zobr. pri polovic. namáck."
+315 "Indikace 12h èasu"
+316 "Zobrazit@namáèknutí spouštì"
 
 317 "Nastavení zobrazení RAW"
 318 "RAW"
 
-319 "Nastavení zobr. místa na karte"
-320 "Místo na karte"
+319 "Nastavení zobr. místa na kartì"
+320 "Místo na kartì"
 
 321 "Uživatelské Auto ISO"
 322 "Uživatelské Auto ISO"
 323 "Povolit uživ. Auto ISO"
-324 "Min. rychlost záverky"
-325 "Uživ. koefic. (1/FL/koef.)"
-326 "IS koeficient (Tv*koef.)"
+324 "Min. rychlost závìrky"
+325 "  Uživ. koefic. (1/FL/koef.)"
+326 "  IS koeficient (Tv*koef.)"
 327 "Max ISO HI (x10)"
 328 "Max ISO AUTO (x10)"
 329 "Min ISO (x10)"
 
-330 "Barva textu titulku menu"
-331 "Barva pozadí titulku menu"
-332 "Barva textu cursoru"
-333 "Barva pozadí cursoru"
-334 "Centrovat Menu"
-335 "Ztlumit zvuk pri zoomování"
-
-336 "Odstr. vadných pixelu"
+330 "Menu - barva textu titulku"
+331 "Menu - barva pozadí titulku"
+332 "Kurzor - barva textu"
+333 "Kurzor - barva pozadí"
+334 "Centrovat menu"
+335 "Ztlumit zvuk pøi zoomování"
+
+336 "Ruèní odstranìní vadných pixelù"
 337 "Vyp."
-338 "Prum."
+338 "Prùmìr"
 339 "RAWconv"
 
-340 "Prekrytí"
-341 "Prekrytí pozadí"
-342 "Zakázat prekrytí"
-343 "  Vcet. AutoIso & Bracketing"
-344 "  Skrýt v "
+340 "Potlaèení"
+341 "Potlaèení - pozadí"
+342 "Zakázat potlaèení"
+343 "  Vèet. AutoIso & Bracketing?"
+344 "  Skrýt v ?"
 345 "Zakázat @ Video Rec?"
-346 "Zobr. zbýv. cas videa"
-347 "  Frekv. obnovení (sec)"
-348 "Zbývající cas videa"
-349 "Mazat param. videa pri startu"
-350 "Povolit rychlé nastavení Ev"
-351 "   Krokovat po (1 EV)"
-352 "EV korekce"
-353 "Opravdu vymazat VŠECHNY\nRAW soubory bez odpovídajících JPG\nv DCIM adresári?"
-354 "Opravdu vymazat VŠECHNY\nRAW soubory bez odpovídajících JPG\nve vybraném adresári?"
-355 ""Opravdu vymazat VŠECHNY\nRAW soubory bez odpovídajících JPG\n(Vyjma oznacenýc)"
-356 "Funkce cištení RAW\nse nedá aplikovat na tuto položku"
-357 "*** Cištení RAW souboru ***"
-358 "Cištení RAW"
+346 "Zobr. zbýv. èas videa?"
+347 "  Frekvence obnovení (~s)"
+348 "Zbývající èas videa"
+349 "Smazat param. videa@spušt.?"
+350 " "
+351 " "
+352 "Korekce EV"
+353 "OPRAVDU vymazat VŠECHNY\nRAW soubory bez odpovídajících JPG\nv adresáøi DCIM?"
+354 "OPRAVDU vymazat VŠECHNY\nRAW soubory bez odpovídajících JPG\nve vybraném adresáøi?"
+355 "OPRAVDU vymazat VŠECHNY\nRAW soubory bez odpovídajících JPG\n(vyjma oznaèených)"
+356 "Funkce èištìní RAW\nse nedá aplikovat na tuto položku"
+357 "*** Èištìní RAW souborù ***"
+358 "Èištìní RAW"
  
-359 "Uživatel. menu jako základní"
-
-360 "Font symbolu"
-361 "Výber souboru se Symboly"
+359 "Uživatel. menu jako poèátek"
+
+360 "Písmo symbolù"
+361 "Vybrat soubor symbolù"
 362 "Povolit symboly"
-363 "Barva textu symbolu" 
-364 "Barva pozadí symbolu"
-
-365 "Uživatelské tonální krivky"
-366 "Uživatelské tonální krivky"
-367 "Otevrít profil krivky..."
-368 "Povolit krivky"
-369 "Výber souboru s krivkami"
-
-370 "Prekrytí okraju"
-371 "Prekrytí okraju"
-
-372 "Povolit prekrytí okraju"
-373 "Práh prekrytí okraju"
-374 "Barva prekrytí okraju"
-
-375 "Parametry dálk. spoušte"
-376 "Parametry dálk. spoušte"
-377 "Povolit dálk. spoušt"
+363 "Symbol - barva textu" 
+364 "Symbol - barva pozadí"
+
+365 "Uživatelské tonální køivky"
+366 "Uživatelské tonální køivky"
+367 "Naèíst profil køivky..."
+368 "Povolit køivky"
+369 "Vybrat soubor s køivkami"
+
+370 "Pøekrytí okrajù"
+371 "Pøekrytí okrajù (nástroj panoramat)"
+
+372 "Povolit pøekrytí okrajù"
+373 "Práh pøekrytí okrajù"
+374 "Barva pøekrytí okrajù"
+
+375 "Parametry dálk. spouštì"
+376 "Parametry dálk. spouštì"
+377 "Povolit synch. dálk. spouš"
 378 "Povolit synchronizaci"
 379 "Povolit synchr. prodlevu"
@@ -492 +490 @@
 381 "Synchr. prodleva 0.1s"
 
-382 "AF key"
-383 "Nahrát vých. hodnoty param."
-384 "Nastavení parametru"
-
-385 "Zakázat Raw @ Sport"
-386 "Zakázat Raw @ Burst"
-387 "Zakázat Raw @ EV Bracketing"
-388 "Zakázat Raw @ Timer"
-
-389 "Vyjímky"
-390 "Menu vyjímek RAW"
-391 "Varovat pri vyjímkách"
-392 "Vždy vybrat první v menu"
+382 "Tlaèítko AF"
+383 "Naèíst vých. hodnoty param."
+384 "Nastavení parametrù"
+
+385 "Zakázat RAW @ sport"
+386 "Zakázat RAW @ shluk"
+387 "Zakázat RAW @ EV Bracketing"
+388 "Zakázat RAW @ èasovaè"
+
+389 "Výjimky"
+390 "Menu výjimek RAW"
+391 "Varovat pøi výjimkách"
+392 "Vždy vybrat 1. položku@menu"
 
 393 "Prodleva (0.1s)"
-394 "Synchroniz. dálk. spoušt"
-395 "Rychlé ovlád. videa"
+394 "Synchroniz. dálk. spouš"
+395 "Rychlé ovládání videa?"
 396 "Teplota"
-397 "Zobrazit teplotu"
-398 "Rídit kvalitu videa"
-399 "Povolit dálkový Zoom"
-400 "Prodleva Zoomu 0.1s"
-401 "Zvuky pri startu"
-402 "Prefix odecteného RAW"
-403 "prípona odecteného RAW"
-404 "Odec. vstup. tmavé hodn."
-405 "Odec. výstup. tmavé hodn."
+397 "Zobrazit teplotu?"
+398 "Øídit kvalitu videa?"
+399 "Povolit vzdálené pøiblížení"
+400 "Prodleva pøiblížení 0,1s"
+401 "Zvuk pøi startu"
+402 "Prefix odeèteného RAW"
+403 "Pøípona odeèteného RAW"
+404 "Odeè. vstup. tmavé hodn."
+405 "Odeè. výstup. tmavé hodn."
 406 "od"
 407 "...%d více souboru"
-408 "Odecítání"
-409 "Odecíst od oznaceného"
-410 "Ukládat parametry"
-411 "Zobrazení Video Ev"
-412 "   Hodnota prekrytí Zoom"
-413 "Prekrytí Zoom"
-414 "Nulovat na zacátku"
-415 "Pripojit RAW príponu"
+408 "Odeèítání"
+409 "Odeèíst od oznaèeného"
+410 "Uložit parametry"
+411 "Zobrazení Ev videa"
+412 "   Hodnota potlaèení pøiblížení"
+413 "Potlaèení pøiblížení"
+414 "   Smazat@spušt."
+415 "Pøipojit RAW pøíponu"
 416 "  ve Fahrenheitech"
-417 "Otevrít prekrytí okraju"
-418 "Uložit prekrytí okraju"
+417 "Naèíst pøekrytí okrajù"
+418 "Uložit pøekrytí okrajù"
 419 "Povolit v Prohlížení"
-420 "Volná vnitrní pamet"
-421 "Otevrít + nastavit Zoom"
-422 "Zamknout prekrytí okraju"
-423 "Synch.blesku na zadní lamelu"
+
+421 "Naèíst+nastavit pøiblížení"
+422 "Režim panoramat"
+423 "Synch. blesku na 2. lamelu"
 424 "DNG formát"
-425 "RAW buffer uložen"
-426 "Nemohu otevrít CHDK/badpixel.bin\nProsím spust \nCHDK/SCRIPTS/TEST/badpixel.lua"
-427 "Ukázat ukládací cas RAW"
-428 "Ctverice"
-429 "Souper:"
-430 "Clovek"
-431 "Hrác c.1 vyhrál"
-432 "Hrác c.2 vyhrál"
-433 "Porazil jsem Te"
-434 "Nerozhodne"
-435 "Zakázat RAW @ prekrytí okraju"
-436 "Zakázat RAW @ Auto Mode"
-437 "Povolit blesk ve videu?"
-438 "   Výkon blesku"
-439 "´DNG´ prípona"
-440 "DNG viditelné pres USB"
+425 "Uložit vyrov. pamì RAW"
+426 "Nelze naèíst CHDK/badpixel.bin\nPoužijte nejprve 'Vytvoøit badpixel.bin'"
+427 "Zobrazit èas uložení RAW"
+428 "Ètveøice"
+429 "Soupeø:"
+430 "Èlovìk"
+431 "Hráè è. 1 vyhrál"
+432 "Hráè è .2 vyhrál"
+433 "Porazil jsem Tì"
+434 "Nerozhodnì"
+435 "Zakázat RAW @ pøekrytí okrajù"
+436 "Zakázat RAW @ režim Auto"
+437 "   POUZE ve videu"
+438 " "
+439 "Pøípona 'DNG' souboru"
+440 "DNG viditelné pøes USB"
 441 "Mastermind"
 442 "dostupné barvy"
-443 "na správné míste"
+443 "na správném místì"
 444 "odpovídající barvy"
-445 "SPRÁVNE :-)"
+445 "SPRÁVNÌ :-)"
 446 "KONEC HRY"
-447 "[<-] [->] vyber sloupec"
-448 "[UP] [DOWN] vyber barvu"
-449 "[SET] další rádek"
+447 "[<-] [->] vybrat sloupec"
+448 "[UP] [DOWN] vybrat barvu"
+449 "[SET] další øádek"
 450 "Žádná barva 2x"
-451 "reset souboru"
-452 "restartuj prístroj ..."
-453 "Rucne uvolni blesk"
+451 "Obnovit písma menu"
+452 "restartovat foák..."
+453 " "
+454 "Potlaèit kvalitu"
+455 "Restartovat Lua pøi chybì"
+456 "Filtrovat okraje"
+457 "Zobrazit vždy"
+458 "   Pøekrytí panoramat (%)"
+459 "Vytvoøit badpixel.bin"
+460 "Pro tuto operaci je nutné být\n v režimu záznamu."
+461 "%s zakázáno pøi sestavení"
+462 "Potlaèení dotykové obrazovky"
+463 "Ovládání AE videa"
+464 "Tlaèítka zkratek <Alt>"
+465 "Informace o USB"
+466 "Zobrazit informace o USB"
+467 "Uložit log ROM selhání"
+468 "CHYBA: SystemEventInit a System.Create selhalo"
+469 "Log ROM selhání nemohl být uložen"
+470 "Log ROM selhání byl uložen do ROMLOG.LOG"
+
+471 "Typ pøepnutí"
+472 "Režim ovládání"
+473 "Možnosti"
+
+474 "Nastavení textového pole"
+475 "Vybrat znak. sadu text. pole"
+476 "Více ->"
+477 "Vytvoøit složku"
+478 "Pøejmenovat"
+479 "Zadejte název složky:"
+480 "Zadejte nový název souboru:"
+481 "Odstranit složku"
+
+482 "Aktuální uživatelská køivka"
+483 "Tetris"
+484 "Zobrazit èíslo oddílu"
+485 "Video bez èasového limitu"
+486 "CMOS se mùže bìhem dlouhého záznamu pøehøát!"
+
+//GPS Anfang---------------------------------
+487 "Nastavení GPS"
+488 "Zobrazit navigaci"
+489 "Zobrazit kompas"
+490 "Zobrazit zemìpisné souøadnice"
+491 "Zobrazit nadmoøskou výšku"
+492 "Save waypoint to each JPG"
+493 "GPX-Track - Time Interval           [s]"
+494 "GPX-Track Record                  Start"
+495 "GPX-Track Record                   Stop"
+496 "Quit showing Compass"
+497 "Quit showing navigation"
+498 "Waiting Time for GPS-Signal         [s]"
+499 "Compass    - Sample interval        [s]"
+500 "Navigation - Sample interval        [s]"
+501 "Time to change to play-mode         [s]"
+502 "Time to deactivate backlight        [s]"
+503 "Common Settings"
+504 "Sampling interval until GPS receipt.[s]"
+505 "Attenuation of compass           [1-40]"
+506 "Logging    - Settings"
+507 "Tagging    - Settings"
+508 "Navigation - Settings"
+509 "Shutdown at battery level       [0-99%]"
+510 "Delayed Tagging - Short string"
+511 "0 - 2D-3D Fix"
+512 "Blinking LED during Delayed Tagging"
+513 "Change to play-mode"
+514 "Shutdown backlight"
+515 "Change to play-mode"
+516 "Shutdown backlight"
+517 "Time to change to play-mode         [s]"
+518 "Time to deactivate backlight        [s]"
+519 "Zobrazit stav GPS"
+520 "Alert on low battery"
+521 "Set position as home location" 
+522 "Bring me home                     Start"
+523 "Set position as current timezone"
+524 "Show track record symbol"
+525 "Bring me home                      Stop"
+526 "Check change of Timezone"
+527 "Audio Warnings                 [on/off]"
+528 "GPS - CHDK                     [on/off]"
+529 "Bez GPS!"
+530 "Timezone has changed!"
+531 "Battery below setting!"
+532 "Camera will shutdown in %02d seconds!"
+533 "Automatic shutdown cancelled!"
+534 "Camera will wait for GPS for %01d:%02d"
+535 "Navigation to Home Loc is not possible!"
+536 "Cant navigate to photo: %s!"
+537 "Distance:    = %i m"
+538 "Duration:    = %i:%i:%i"
+539 "Pace:        = %s km/h"
+540 "Direction:   = %i°"
+541 "Destination: = %i°"
+542 "Navigation to photo: %s started"
+543 "latitude=%s  -  longitude=%s "
+544 "heading = %i°"
+545 "Navigation to Home Loc started"
+//GPS Ende-----------------------------------------
+
+546 "Druhá alternativní MIN spouš"
+547 "Druhé alternativní MAX ISO (x10)"
+548 "Denní kompen. pøeexp."
+549 "Kompenzovat, když pøeexp.>= x%"
+
+550 "Pro storno [namáèknìte]"
+
+551 "Povolit start skriptu"
+
+552 "Zakázat tlaèítko asistence pøiblížení"
+
+553 "Verze DNG"
+554 "Nastavení menu"
+555 "Zobr. obrazovku nápov. <ALT>"
+556 "  Prodleva obraz. nápov."
+557 "Nastavení CHDK"
+
+// <ALT> mode help screen text
+558 "%-17s %-18s"                           // Header format, adjust if needed; but total len must be 35
+559 "Zkratky <ALT>"                       // Len must be <= first string in header format (17)
+560 "Namáèknutí +"                  // Len must be <= first string in header format (17)
+561 "MENU = Menu CHDK"                        // Len must be <= second string in header format (18)
+562 "MENU = Uživ. menu"                        // Len must be <= second string in header format (18)
+563 "SET/SPOUŠ = Menu/Spuštìní skriptu "   // Len must be <= 35
+564 "Fokus  %5s=Inf.  %5s=HyperFocal"       // Len must be <= 35
+565 "Manuální fokus"
+566 "Skrýt OSD CHDK pøi zmáèknutí"
+567 "  * - není k dispoz. v režimu <ALT>"   // Len must be <= 35
+
+568 "Položka '%s'\npøidána do uživatelského menu"
+569 "Uživatelské menu je plné"
+
+570 "SD karta"
+571 "Jazyk a písmo"
+
+572 "Ruèní blesk (výkon)"
+573 "Fast Ev step size"
+574 "Zobrazit NÁPOVÌDU"
+575 "Use popup to edit value"

branches/tsvstar-uitest/CHDK/LANG/english.lng

@@ -705 +705 @@
 575 "Use popup to edit value"
 
-576 "Base"
-577 "Profile Manager"
-578 "Profiles"
-579 "Profile Menu"
-580 "Main Menu"
-581 ""
-
+576 "Add script to User Menu"
+
+577 "Left, Right & Jogdial = Change Value"
+578 "Zoom = Adjust Increment Factor"
+579 "SET  = Confirm, DISP = Cancel"
+580 "MENU = Turn On/Off"
+
+581 "Infinity Focus"
+582 "Chg Focus Factor"
+
+583 "Base"
+584 "Profile Manager"
+585 "Profiles"
+586 "Profile Menu"
+587 "Main Menu"
+588 ""
+

branches/tsvstar-uitest/CHDK/LANG/german.lng

@@ -719 +719 @@
 575 "Popup-Menü für Werteeingaben"
 
+576 "Skript in Benutzer-Menü einfügen"
+
+577 "Li, Re &  Drehrad = Werteänderung"
+578 "Zoom = Eingabeschrittweite wählen"
+579 "SET  = Bestätigen, DISP = Abbruch"
+580 "MENU = Funktion  Ein-/Ausschalten"
+
+581 "unendlicher Fokus"
+582 "Fokus Schrittweite"

branches/tsvstar-uitest/CHDK/SCRIPTS/EDITOR/EDI.lua

@@ -1 +1 @@
 --[[
 @title EDI - text editor
-@param n Newline (1=Windows 2=Unix)
-@default n 1
+@param n Newline  (0=Windows 1=Unix)
+@default n 0
+@values n Windows Unix
 @param y Editor height
 @default y 14
+@range y 10 20
 @param x Editor width
 @default x 40
---new file option doesn`t work yet
---@param a Write new file? [T=1/N=0]
---@default a 0
+@range x 30 50
+@param s Browser in SCRIPTS? (1=Yes)
+@default s 1
+@range s 0 1
+@param a Write a new file?   (1=Yes)
+@default a 0
+@range a 0 1
+@param b Do backups?          (0=No)
+@default b 1
+@range b 0 1
+--@param z Has this camera zoom?(0=NO)
+--@default z 1
 --]]
 --[[
-    Version:    2.4
-    Author:     Pawel Tokarz aka Outslider
-    License:    GPL 3+; see: http://www.gnu.org/licenses/gpl-3.0.html
+    Version:    2.7
+    Author:     Pawel Tokarz aka outslider
+    License:    GPL 3+;see: http://www.gnu.org/licenses/gpl-3.0.html
                 in order to use with GPL<3: You can also use it with GPL<3 software.
-    
+
+    ----------------------------------------------------------------
+    |  This version requires CHDK with Virtual Keyboard module!!!  |
+    ----------------------------------------------------------------
+
     Changelog for 2.x series:
-    - file_browser() - new CDHK function used instead of lua browser
-    - 'menu', 'display' and 'shoot_half' buttons might be changed now (by setting global variables)
-    - small cleaning the code
+    - 'new file' option added
+    - empty file opening fixed (however really empty file can't be saved, it'll contain \n at least...)
+    - usage of text_box() for 'save as...' and new file name (thx for TobiMarg, tsvstar, philmoz, msl and others)
+    - some changes in menu() function
+    - fixed bug while browser is closed
+    - erase in MOVE mode jumps to the begin of the file
+    - more staff added but might be not mentioned
 
     More info you can find on CHDK Forum http://chdk.setepontos.com/index.php?topic=6465.0
@@ -32 +51 @@
 --maximal x and y belong to the user
 
-if n>2 then
+if n>1 then
     print("Newline setting incorrect")
     print("Using Unix style [\\n]")
     print("Press any key...")
-    wait_click(60000)
-    n=2
-    end
-if n<1 then
+    wait_click(0)
+    n=1
+    end
+if n<0 then
     print("Newline setting incorrect")
     print("Using Windows style [\\r\\n]")
     print("Press any key...")
-    wait_click(60000)
-    n=1
-    end
-
-if n==1 then CR="\r" end
-if n==2 then CR="" end
+    wait_click(0)
+    n=0
+    end
+
+if n==0 then CR="\r" end
+if n==1 then CR="" end
 -- /CHECK GIVEN PARAMETERS --
 
@@ -54 +73 @@
 CONSOLE_HEIGHT=y
 CONSOLE_WIDTH=x
-PATH="A/CHDK/SCRIPTS"  --where to open file_browser()?
+PATH="A"  --where to open file_browser()?
 EXIT=false
 SAVED='S'              --is file saved?
@@ -67 +86 @@
 LETTER_NR=1
 WRITE_KEY=0
-EDI_VERSION="2.4"
+EDI_VERSION="2.5"
 --which key does what?
 FILE_MENU_BUTTON="menu"
@@ -76 +95 @@
 INSERT_MAP={{"newline"},{"(",")","[","]","{","}"},{"<",">",",","'",":",";"},{"_","+","-","/","\\","="},{"@","!","?","#","\"","."},{"~","&","*","|","^","`"},{"ASCII code"}}
 FUNCTION_MAP={{"print","shoot"},{"is_key","if"},{"then","end"},{"sleep","wait_click"},{"function","@title"},{"@param","@default"},{"--[[","--]]"}}
-FILE_MENU={{"Save"},{"Save and exit"},{"Exit (no save!)"},{"Clear whole file"},{"About EDI"}}
+FILE_MENU={{"Save"},{"Save and exit"},{"Save as..."},{"Exit (no save!)"},--[[{"Select..."},#for selecting]]{"Clear whole file"},{"About EDI"}}
 TOPBAR="EDI - Text editor"
 STATUSBAR="statbar"
 FILENAME=""
+FILE_CONTENT={}
+KEYS_TABLE={"left","up","right","down","set","shoot_half","shoot_full","menu","display","erase","zoom_in","zoom_out"}
+REPEATABLE_KEYS_TABLE={"left","up","right","down","zoom_out","zoom_in"}
+SAVE_DIRS={{"A"},{"A/CHDK"},{"A/CHDK/SCRIPTS"},{"Cancel"}}
+WAIT_TIME=0--#for selecting
+DEBBUG="ok"
 -- /CONFIGURATION --
 
-function get_input()
-    KEYS_TABLE={"left","up","right","down","set","shoot_half","shoot_full","menu","display","erase","zoom_in","zoom_out"}
-    REPEATABLE_KEYS_TABLE={"left","up","right","down","zoom_out","zoom_in"}
+function get_input(keys_table,repeatable_keys_table,wait_time,repeat_delay)
     PRESSED_KEY=nil
-    for key_nr=1, table.getn(REPEATABLE_KEYS_TABLE) do
-        if is_pressed(REPEATABLE_KEYS_TABLE[key_nr]) then PRESSED_KEY=REPEATABLE_KEYS_TABLE[key_nr]
+    if (wait_time==nil or wait_time<0) then wait_time=0 end
+    for key_nr=1, table.getn(repeatable_keys_table) do
+        if is_pressed(repeatable_keys_table[key_nr]) then PRESSED_KEY=repeatable_keys_table[key_nr]
             end
         end
     if PRESSED_KEY~=nil then
         repeat
-            if get_tick_count()-PRESSED_TIME>350 then sleep(100); return PRESSED_KEY end 
+            if get_tick_count()-PRESSED_TIME>350 then sleep(100);return PRESSED_KEY end 
             until not is_pressed(PRESSED_KEY)
         end
-    wait_click(60000)
+    wait_click(wait_time)
     PRESSED_TIME=get_tick_count()
-    for key_nr=1, table.getn(KEYS_TABLE) do
-        if is_key(KEYS_TABLE[key_nr]) then PRESSED_KEY=KEYS_TABLE[key_nr]; return KEYS_TABLE[key_nr] end
-        end
+    for key_nr=1, table.getn(keys_table) do
+        if is_key(keys_table[key_nr]) then PRESSED_KEY=keys_table[key_nr];return keys_table[key_nr] end
+        end
+    return nil
+    end
+
+function new_file()
+   FILE_CONTENT={""}
+   FILE_LINESN=1
+   end
+
+function give_me_filename()
+    dir_name=menu(SAVE_DIRS,CONSOLE_WIDTH,CONSOLE_HEIGHT,"select a directory",20,2)
+    if (dir_name=="Cancel") then return(nil) end
+    file_name=textbox("File name", "Enter file name", "new_file.txt", 16)
+    if (file_name==nil or file_name=="") then FILENAME="new_file.txt" end
+    out=dir_name.."/"..file_name
+    FILENAME=file_name
+    return out
     end
 
@@ -107 +147 @@
 
 function load_file()
+    if s==1 then
+        PATH="A/CHDK/SCRIPTS"
+        end
     file=file_browser(PATH)
-    for li=0,string.len(file) do
-        char=string.sub(file,string.len(file)-li,string.len(file)-li)
-        if char~="/" then
-            FILENAME=char..FILENAME
-            else break
-            end
-        end
-    --lets try to load this file--
-    file_h=io.open(file,"r")
-    print("take file content by lines")
-    FILE_CONTENT={}
-    line=1
-    repeat
-        FILE_CONTENT[line]=file_h:read("*line")
-        FILE_LINESN=line-1
-        line=line+1
-        until FILE_CONTENT[line-1]==nil
-    file_h:close()    
-    print(FILE_LINESN)
+    if file==nil then
+        print("No file selected!")
+        restore()
+    else
+        for li=0,string.len(file) do
+            char=string.sub(file,string.len(file)-li,string.len(file)-li)
+            if char~="/" then
+                FILENAME=char..FILENAME
+                else break
+                end
+            end
+        --lets try to load this file--
+        file_h=io.open(file,"r")
+        print("Loading, wait...")
+        FILE_CONTENT={}
+        line=1
+        repeat
+            FILE_CONTENT[line]=file_h:read("*line")
+            FILE_LINESN=line-1
+            line=line+1
+            until FILE_CONTENT[line-1]==nil
+        file_h:close()
+        if FILE_CONTENT[1]==nil then FILE_CONTENT={""} end
+        if FILE_LINESN==0 then FILE_LINESN=1 end
+        end
     end
 
@@ -137 +186 @@
     if SHIFT_Y<0 then SHIFT_Y=0 end
     print(mk_bar(TOPBAR,CONSOLE_WIDTH))
-    for line_nr=1, CONSOLE_HEIGHT-3 do
+    for line_nr=1, CONSOLE_HEIGHT-2 do
         if FILE_CONTENT[line_nr+SHIFT_Y]==nil then
             draw_line=""
@@ -155 +204 @@
 
 function edi_move()
-    STATUSBAR="[MOVE]["..JUMPS[JUMP].."\18]["..POS_X..","..POS_Y.."]"
---    if string.len(file)<20 then filepath=file else filepath=string.sub(file,1,7).."."..string.sub(file,string.len(file)-12,string.len(file)) end
-    TOPBAR="EDI \6 "..FILENAME.." ["..SAVED.."] "
+    STATUSBAR="["..MODE.."]["..JUMPS[JUMP].."\18]["..POS_X..","..POS_Y.."/"..FILE_LINESN.."]"
+    TOPBAR="EDI \6 "..FILENAME.." ["..SAVED.."] "..DEBBUG.." "
     edi_draw()
-    input=get_input()
+    input=get_input(KEYS_TABLE,REPEATABLE_KEYS_TABLE, WAIT_TIME)
     if input=="set" then MODE="WRITE" end
     if input=="up" then
@@ -173 +221 @@
     if input=="left" then
         POS_X=POS_X-1
-        if POS_X<0 and POS_Y>1 then POS_Y=POS_Y-1; POS_X=string.len(FILE_CONTENT[POS_Y])
-        elseif POS_X<0 and POS_Y==1 then POS_Y=FILE_LINESN; POS_X=string.len(FILE_CONTENT[POS_Y]) end
+        if POS_X<0 and POS_Y>1 then POS_Y=POS_Y-1;POS_X=string.len(FILE_CONTENT[POS_Y])
+        elseif POS_X<0 and POS_Y==1 then POS_Y=FILE_LINESN;POS_X=string.len(FILE_CONTENT[POS_Y]) end
         end
     if input=="right" then
         POS_X=POS_X+1
-        if POS_X>string.len(FILE_CONTENT[POS_Y]) and POS_Y<FILE_LINESN then POS_Y=POS_Y+1; POS_X=0
-        elseif POS_X>string.len(FILE_CONTENT[POS_Y]) and POS_Y>=FILE_LINESN then POS_Y=1; POS_X=0 end
+        if POS_X>string.len(FILE_CONTENT[POS_Y]) and POS_Y<FILE_LINESN then POS_Y=POS_Y+1;POS_X=0
+        elseif POS_X>string.len(FILE_CONTENT[POS_Y]) and POS_Y>=FILE_LINESN then POS_Y=1;POS_X=0 end
         end
     if input=="zoom_in" then
         POS_X=POS_X+5
-        if POS_X>string.len(FILE_CONTENT[POS_Y]) and POS_Y<FILE_LINESN then POS_Y=POS_Y+1; POS_X=0
-        elseif POS_X>string.len(FILE_CONTENT[POS_Y]) and POS_Y>=FILE_LINESN then POS_Y=1; POS_X=0 end
+        if POS_X>string.len(FILE_CONTENT[POS_Y]) and POS_Y<FILE_LINESN then POS_Y=POS_Y+1;POS_X=0
+        elseif POS_X>string.len(FILE_CONTENT[POS_Y]) and POS_Y>=FILE_LINESN then POS_Y=1;POS_X=0 end
         end
     if input=="zoom_out" then
         POS_X=POS_X-5
-        if POS_X<0 and POS_Y>1 then POS_Y=POS_Y-1; POS_X=string.len(FILE_CONTENT[POS_Y])
-        elseif POS_X<0 and POS_Y==1 then POS_Y=FILE_LINESN; POS_X=string.len(FILE_CONTENT[POS_Y]) end
+        if POS_X<0 and POS_Y>1 then POS_Y=POS_Y-1;POS_X=string.len(FILE_CONTENT[POS_Y])
+        elseif POS_X<0 and POS_Y==1 then POS_Y=FILE_LINESN;POS_X=string.len(FILE_CONTENT[POS_Y]) end
+        end
+    if input=="erase" then
+        POS_X=0
+        POS_Y=1
         end
     if input==CHANGE_SUBMODE_BUTTON then JUMP=JUMP+1 end
     if JUMP>table.getn(JUMPS) then JUMP=1 end
     if input==FILE_MENU_BUTTON then
-        todo=menu(FILE_MENU,CONSOLE_WIDTH,CONSOLE_HEIGHT,"File menu",16)
+        todo=menu(FILE_MENU,CONSOLE_WIDTH,CONSOLE_HEIGHT,"File menu",nil,2)
         if todo=="Save" then save() end
-        if todo=="Save and exit" then save();exit() end
-        if todo=="Exit (no save!)" then exit() end
+        if todo=="Save as..." then save_as() end
+        if todo=="Save and exit" then save();restore() end
+        --if todo=="Select..." then MODE="SELECT" end #for selecting
+        if todo=="Exit (no save!)" then restore() end
         if todo=="Clear whole file" then clear() end
         if todo=="About EDI" then about() end
@@ -214 +268 @@
     write_mode_descript=write_mode_descript.."\6"
     STATUSBAR=write_mode_descript
-    TOPBAR="EDI \6 "..FILENAME.." ["..SAVED.."] "
+    TOPBAR="EDI \6 "..FILENAME.." ["..SAVED.."] "..DEBBUG.." "
     insertion=""
     edi_draw()
-    input=get_input()
+    input=get_input(KEYS_TABLE,REPEATABLE_KEYS_TABLE,WAIT_TIME)
     if input==CHANGE_SUBMODE_BUTTON then
         WRITE_SUBMODE=WRITE_SUBMODE+1
@@ -223 +277 @@
         if WRITE_SUBMODE>table.getn(KEYMAP) then WRITE_SUBMODE=1 end
         end
-    if input=="left" and WRITE_KEY==1 then LETTER_NR=LETTER_NR+1; delete=1; SAVED="!"
-        elseif input=="left" and WRITE_KEY~=1 then LETTER_NR=1; WRITE_KEY=1; SAVED="!"
-        elseif input=="up" and WRITE_KEY==2 then LETTER_NR=LETTER_NR+1; delete=1; SAVED="!"
-        elseif input=="up" and WRITE_KEY~=2 then LETTER_NR=1; WRITE_KEY=2; SAVED="!"
-        elseif input=="right" and WRITE_KEY==3 then LETTER_NR=LETTER_NR+1; delete=1; SAVED="!"
-        elseif input=="right" and WRITE_KEY~=3 then LETTER_NR=1; WRITE_KEY=3; SAVED="!"
-        elseif input=="down" and WRITE_KEY==4 then LETTER_NR=LETTER_NR+1; delete=1; SAVED="!"
-        elseif input=="down" and WRITE_KEY~=4 then LETTER_NR=1; WRITE_KEY=4; SAVED="!"
-        end
-    if input=="zoom_in" or (input=="erase" and ERASE_AS_SPACE[WRITE_SUBMODE]==true) then WRITE_KEY=0; insertion=" "; SAVED="!" end
+    if input=="left" and WRITE_KEY==1 then LETTER_NR=LETTER_NR+1;delete=1;SAVED="!"
+        elseif input=="left" and WRITE_KEY~=1 then LETTER_NR=1;WRITE_KEY=1;SAVED="!"
+        elseif input=="up" and WRITE_KEY==2 then LETTER_NR=LETTER_NR+1;delete=1;SAVED="!"
+        elseif input=="up" and WRITE_KEY~=2 then LETTER_NR=1;WRITE_KEY=2;SAVED="!"
+        elseif input=="right" and WRITE_KEY==3 then LETTER_NR=LETTER_NR+1;delete=1;SAVED="!"
+        elseif input=="right" and WRITE_KEY~=3 then LETTER_NR=1;WRITE_KEY=3;SAVED="!"
+        elseif input=="down" and WRITE_KEY==4 then LETTER_NR=LETTER_NR+1;delete=1;SAVED="!"
+        elseif input=="down" and WRITE_KEY~=4 then LETTER_NR=1;WRITE_KEY=4;SAVED="!"
+        end
+    if input=="zoom_in" or (input=="erase" and ERASE_AS_SPACE[WRITE_SUBMODE]==true) then WRITE_KEY=0;insertion=" ";SAVED="!" end
     if input=="zoom_out" or(input=="erase" and ERASE_AS_SPACE[WRITE_SUBMODE]~=true) then
         SAVED="!"
         if POS_X>0 then
-            WRITE_KEY=0; delete=1
+            WRITE_KEY=0;delete=1
         elseif POS_X==0 and POS_Y>1 then
             POS_X=string.len(FILE_CONTENT[POS_Y-1])
@@ -254 +308 @@
         end
     if input=="set" and WRITE_KEY==0 then MODE="MOVE"
-        elseif input=="set" and WRITE_KEY~=0 then WRITE_KEY=0; insertion=""
+        elseif input=="set" and WRITE_KEY~=0 then WRITE_KEY=0;insertion=""
         end
     if input==INSERT_MENU_BUTTON then
-        WRITE_KEY=0; insertion=""; SAVED="!"
-        insertion=menu(INSERT_MAP,CONSOLE_WIDTH,CONSOLE_HEIGHT,"Insert a special char")
-        if insertion==nil then insertion=menu(FUNCTION_MAP,CONSOLE_WIDTH,CONSOLE_HEIGHT,"Insert a function",10) end
-        if insertion==nil then insertion=""; SAVED="S" end
+        WRITE_KEY=0;insertion="";SAVED="!"
+        insertion=menu(INSERT_MAP,CONSOLE_WIDTH,CONSOLE_HEIGHT,"Insert a special char",nil,2)
+        if insertion==nil then insertion=menu(FUNCTION_MAP,CONSOLE_WIDTH,CONSOLE_HEIGHT,"Insert a function",10,2) end
+        if insertion==nil then insertion="";SAVED="S" end
         if insertion=="newline" then
             insertion=""
@@ -275 +329 @@
         end
     if input==FILE_MENU_BUTTON then
-        WRITE_KEY=0; insertion=""
-        todo=menu(FILE_MENU,CONSOLE_WIDTH,CONSOLE_HEIGHT,"File menu")
+        WRITE_KEY=0;insertion=""
+        todo=menu(FILE_MENU,CONSOLE_WIDTH,CONSOLE_HEIGHT,"File menu",nil,2)
         if todo=="Save" then save() end
-        if todo=="Save and exit" then save();exit() end
-        if todo=="Exit (no save!)" then exit() end
+        if todo=="Save and exit" then save();restore() end
+        if todo=="Save as..." then save_as() end
+        if todo=="Exit (no save!)" then restore() end
         if todo=="Clear whole file" then clear() end
         if todo=="About EDI" then about() end
         end
+    if input==nil then WRITE_KEY=0;insertion="" end
     FILE_CONTENT[POS_Y]=string.sub(FILE_CONTENT[POS_Y],1,POS_X-delete)..insertion..string.sub(FILE_CONTENT[POS_Y],POS_X+1,string.len(FILE_CONTENT[POS_Y]))
     POS_X=POS_X+string.len(insertion)-delete
@@ -305 +361 @@
             print()
             end
-        input=get_input()
+        input=get_input(KEYS_TABLE,REPEATABLE_KEYS_TABLE)
         if input=="right" then pos=pos+1 end
         if input=="left" then pos=pos-1 end
@@ -315 +371 @@
         if code[pos]<0 then code[pos]=9 end
         ascii=code[1]*100+code[2]*10+code[3]
-        --code 0 is legal, but this char makes all the chars after \0 invisible, so it's probably useless; this is just to avoid confusion.
+        --code 0 is legal, but this char makes all the chars after \0 invisible, so it's probably useless;this is just to avoid confusion.
         if ascii<256 and ascii>0 then mass="character: "..string.char(ascii) else mass="bad value" end
         if input=="set" then
@@ -323 +379 @@
                 end
             end
+--        if input
         until exit_loop==true
     end
 
-function menu(tab,width,height,header,item_width)
+function menu(tab,width,height,header,item_width,top_lines)
     set_console_autoredraw(0)
     menu_pos_y=1
@@ -335 +392 @@
     if height==nil then print("NO HEIGHT GIVEN!");sleep(3000);return false end
     if width==nil then print("NO WIDTH GIVEN!");sleep(3000);return false end
+    if top_lines==nil then top_lines=0 end
     repeat
         if menu_pos_x<1 and menu_pos_y>1 then menu_pos_y=menu_pos_y-1;menu_pos_x=table.getn(tab[menu_pos_y]) end
@@ -341 +399 @@
         if menu_pos_y>table.getn(tab) then menu_pos_y=1 end
         if menu_pos_x>table.getn(tab[menu_pos_y]) and menu_pos_y<table.getn(tab) then menu_pos_y=menu_pos_y+1;menu_pos_x=1 end
-        if menu_pos_x>table.getn(tab[menu_pos_y]) and menu_pos_y>=table.getn(tab) then menu_pos_y=1; menu_pos_x=1 end
+        if menu_pos_x>table.getn(tab[menu_pos_y]) and menu_pos_y>=table.getn(tab) then menu_pos_y=1;menu_pos_x=1 end
         if menu_pos_y>height-4+menu_shift then menu_shift=menu_pos_y-height+4 end
         if menu_pos_y<=menu_shift then menu_shift=menu_pos_y-1 end
+        for line=0, top_lines do
+            print("")
+            end
         print(mk_bar(header,width))
-        for line=1,height-3 do
+        for line=1,--[[height-3-top_lines]] table.getn(tab) do
             if tab[line+menu_shift]==nil then
                 draw_line=""
@@ -353 +414 @@
                     item=tab[line+menu_shift][place]
                     if item_width~=nil then item=item..string.sub("                         ",1,item_width-string.len(item)) end
+
                     if menu_pos_x~=place then draw_line=draw_line.." "..item.." " end
                     if menu_pos_x==place then draw_line=draw_line.."\16"..item.."\17" end
@@ -367 +429 @@
             end
         print(mk_bar("SELECT-["..menu_pos_x..","..menu_pos_y.."]",width))
-        input=get_input()
+        for line=0, height-4-top_lines-table.getn(tab) do
+            print("")
+            end
+        input=get_input(KEYS_TABLE,REPEATABLE_KEYS_TABLE)
         if input=="up" then menu_pos_y=menu_pos_y-1 end
         if input=="down" then menu_pos_y=menu_pos_y+1 end
         if input=="left" then menu_pos_x=menu_pos_x-1 end
         if input=="right" then menu_pos_x=menu_pos_x+1 end
-        if input=="set" then exit_menu=true; return tab[menu_pos_y][menu_pos_x] end
-        if input==INSERT_MENU_BUTTON or input==FILE_MENU_BUTTON then exit_menu=true; return nil end
+        if input=="set" then exit_menu=true;return tab[menu_pos_y][menu_pos_x] end
+        if input==INSERT_MENU_BUTTON or input==FILE_MENU_BUTTON then exit_menu=true;return nil end
         until exit_menu==true
     end
@@ -381 +446 @@
     console_redraw()
     print(mk_bar("Saving procedure...",CONSOLE_WIDTH))
-    print("--make a backup...")
-    backup_file=file..".BAK"
-    print("  *backup:",backup_file)
-    print("--open files")
-    file_h=io.open(file,"r")
-    backup_file_h=io.open(backup_file,"w")
-    if (not file_h or not backup_file_h) then
-        print("Error opening files")
-        sleep(3000)
-        return
-        end
-    for file_line in file_h:lines() do
-        backup_file_h:write(file_line)
-        backup_file_h:write("\n")
-        end
-    file_h:close()
-    backup_file_h:close()
-    print("--backup done")
-    print()
-    print("--saving file")    
+    if (b~=0 and file~=nil) then
+        print("--make a backup...")
+        backup_file=file..".BAK"
+        print("  *backup:",backup_file)
+        print("--open files")
+        file_h=io.open(file,"r")
+        backup_file_h=io.open(backup_file,"w")
+        if (not file_h or not backup_file_h) then
+            print("Error opening files")
+            print("Press any key")
+            wait_click(0)
+            return
+            end
+        for file_line in file_h:lines() do
+            backup_file_h:write(file_line)
+            backup_file_h:write("\n")
+            end
+        file_h:close()
+        backup_file_h:close()
+        print("--backup done")
+        print()
+        end
+    if file==nil then file=give_me_filename() end
+    if file==nil then return(nil) end
+    print("--saving file")
     file_h=io.open(file,"w")
     if (not file_h) then
         print("Error opening files")
+        print("Press any key")
+        wait_click(0)
         return
         end
@@ -413 +485 @@
     SAVED="S"
     print("The file has been saved")
-    sleep(2000)
+    sleep(1200)
     end
     
-function exit()
+function save_as()
+    file_tmp=file
+    file=nil
+    save()
+    if file==nil then file=file_tmp end
+    end
+    
+function restore()
     cls()
     print("EDI has been terminated.")
     set_console_autoredraw(1)
-    set_console_layout(1,1,26,6) -- not sure if these are good values
+    set_console_layout(0,0,25,5) -- Thx, msl!
     EXIT=true
     end
     
 function clear()
-    ans=menu({{"NO","YES"}},CONSOLE_WIDTH,CONSOLE_HEIGHT,"Are you sure?",5)
-    if ans=="YES" then FILE_CONTENT={""}; FILE_LINESN=1; POS_X=0; POS_Y=1; SAVED="!" end
+    ans=menu({{"NO","YES"}},CONSOLE_WIDTH,CONSOLE_HEIGHT,"Are you sure?",5,2)
+    if ans=="YES" then FILE_CONTENT={""};FILE_LINESN=1;POS_X=0;POS_Y=1;SAVED="!" end
     end
     
@@ -440 +519 @@
     print("  Author:  Pawel Tokarz")
     print("  Thanks:  waterwingz, truhli_fredy,")
-    print("           philmoz, reyalp")
+    print("           philmoz, reyalp & others")
     print("   ")
     print("  More info in README.TXT file")
@@ -448 +527 @@
     exit_about=false
     repeat
-        input=get_input()
+        input=get_input(KEYS_TABLE,REPEATABLE_KEYS_TABLE)
         if input==FILE_MENU_BUTTON then exit_about=true end
         until(exit_about==true)
---    ans=menu({{"OK"}},CONSOLE_WIDTH,CONSOLE_HEIGHT-5,"EDI - version: "..EDI_VERSION,5)
---    if ans=="YES" then FILE_CONTENT={""}; FILE_LINESN=1; POS_X=0; POS_Y=1; SAVED="!" end
     end
 
 function main_loop()
+    DEBBUG=0
     insertion=""
     repeat
-        if MODE=="MOVE" then edi_move() end
+        DEBBUG=DEBBUG+1
+        if MODE=="MOVE" --[[or MODE=="SELECT" #for selecting]] then edi_move() end
         if MODE=="WRITE" then edi_write() end
         until EXIT==true
     end
 
-set_console_layout(1,1,CONSOLE_WIDTH,CONSOLE_HEIGHT)
+set_console_layout(0,0,CONSOLE_WIDTH,CONSOLE_HEIGHT)
 set_console_autoredraw(0)
-load_file()
-main_loop()
-
+if a==1 then
+    new_file()
+    else
+    load_file()
+    end
+if EXIT~=true then main_loop() end
+

branches/tsvstar-uitest/CHDK/SCRIPTS/EDITOR/README.TXT

@@ -2 +2 @@
 'Emacs your camera!'
 
+Documentation for version 2.7 based on documentation for 2.6.
 
 0. ABOUT
@@ -8 +9 @@
     
     **** ATTENTION! ****
-    EDI 2.4 requires file_browser() function which is aviable since changeset 1359! If you have an obsolete CHDK version you'll need to use older EDI version (2.3 for example)
+    Since version 2.6 EDI uses textbox() function which is currently aviable in experimental branch. Because of that 'new file' and 'Save as...' options can not be used in other branches (stable 1.0 and reyalp-flt as well). If 'new file' or 'Save as...' option is used in these branches an error occurs!
+
+    While none of above functions is used, EDI 2.7 should work (althought it was not tested).
+
     
 
@@ -15 +19 @@
     I've tested this script only on SX130IS with no problems. A few users were able to use it on other CHDK-supported cameras. Nevertheless THERE IS NO VARRANTY FOR THIS SOFTWARE, IT'S FREE AND MIGHT BE BUGGY. It's rather not likely, but still possible that it could damage file you are editing or even filesystem on SD card. This never happened, but who knows. USE THIS SCRIPT ON YOUR OWN RISK.
 
+    SOME PARTS OF THIS DOCUMENTATION MIGHT BE OUTDATED OR CONTAIN BUGS.
 
 
@@ -71 +76 @@
     MENU                - open FILE MENU which is described below.
     SET                 - end MOVE mode and go into a WRITE mode.
+    ERASE               - move to the begin of the file.
 
     SHOOT_FULL          - END THE SCRIPT WITHOUT ANY SAVES!!!
@@ -90 +96 @@
     STATUSBAR in WRITE mode describes, which letters/digits are aviable under which keys. STATUSBAR like above means, that you are able to write lowercase letters as follows:
     
-    press LEFT to get letters:  a, b, c, d, e or f
-    press UP to get letters:    g, h, i, j, k or l
-    press RIGHT to get letters: m, n, o, p, q, r or s
-    press DOWN to get letters:  t, u, v, w, x, y or z
+    press LEFT to get letters:  a, b, c, d, e, f
+    press UP to get letters:    g, h, i, j, k, l
+    press RIGHT to get letters: m, n, o, p, q, r, s
+    press DOWN to get letters:  t, u, v, w, x, y, z
     
     When you press a key once you'll get first letter, twice - second and so on. If you need to write another letter just press different letter key. If you need a letter that is aviable under the same key as previous just press SET once and the key. This is just like writing SMS'es on mobile phone.

branches/tsvstar-uitest/core/conf.c

@@ -465 +465 @@
     CONF_INFO(292, conf.show_alt_helper_delay,      CONF_DEF_VALUE,     i:3, NULL),
     CONF_INFO(293, conf.help_was_shown,                 CONF_DEF_VALUE,     i:0, NULL),
-
-    CONF_INFO(1294, conf.menuedit_popup,                CONF_DEF_VALUE,     i:1, NULL),
+    CONF_INFO(294, conf.menuedit_popup,                 CONF_DEF_VALUE,     i:1, NULL),
+
+    // NOTE : there must be USER_MENU_ITEMS entries in this section
+    CONF_INFO(295, conf.user_menu_script_file[ 0], CONF_CHAR_PTR,      ptr:"", NULL),
+    CONF_INFO(296, conf.user_menu_script_file[ 1], CONF_CHAR_PTR,      ptr:"", NULL),
+    CONF_INFO(297, conf.user_menu_script_file[ 2], CONF_CHAR_PTR,      ptr:"", NULL),
+    CONF_INFO(298, conf.user_menu_script_file[ 3], CONF_CHAR_PTR,      ptr:"", NULL),
+    CONF_INFO(299, conf.user_menu_script_file[ 4], CONF_CHAR_PTR,      ptr:"", NULL),
+    CONF_INFO(300, conf.user_menu_script_file[ 5], CONF_CHAR_PTR,      ptr:"", NULL),
+    CONF_INFO(301, conf.user_menu_script_file[ 6], CONF_CHAR_PTR,      ptr:"", NULL),
+    CONF_INFO(302, conf.user_menu_script_file[ 7], CONF_CHAR_PTR,      ptr:"", NULL),
+    CONF_INFO(303, conf.user_menu_script_file[ 8], CONF_CHAR_PTR,      ptr:"", NULL),
+    CONF_INFO(304, conf.user_menu_script_file[ 9], CONF_CHAR_PTR,      ptr:"", NULL),
+    CONF_INFO(305, conf.user_menu_script_file[10], CONF_CHAR_PTR,      ptr:"", NULL),    
+    CONF_INFO(306, conf.user_menu_script_file[11], CONF_CHAR_PTR,      ptr:"", NULL),
+    CONF_INFO(307, conf.user_menu_script_file[12], CONF_CHAR_PTR,      ptr:"", NULL),
+    CONF_INFO(308, conf.user_menu_script_file[13], CONF_CHAR_PTR,      ptr:"", NULL),
+
+    // NOTE : there must be USER_MENU_ITEMS entries in this section too
+    CONF_INFO(309, conf.user_menu_script_title[ 0], CONF_CHAR_PTR,      ptr:"", NULL),
+    CONF_INFO(310, conf.user_menu_script_title[ 1], CONF_CHAR_PTR,      ptr:"", NULL),
+    CONF_INFO(311, conf.user_menu_script_title[ 2], CONF_CHAR_PTR,      ptr:"", NULL),
+    CONF_INFO(312, conf.user_menu_script_title[ 3], CONF_CHAR_PTR,      ptr:"", NULL),
+    CONF_INFO(313, conf.user_menu_script_title[ 4], CONF_CHAR_PTR,      ptr:"", NULL),
+    CONF_INFO(314, conf.user_menu_script_title[ 5], CONF_CHAR_PTR,      ptr:"", NULL),
+    CONF_INFO(315, conf.user_menu_script_title[ 6], CONF_CHAR_PTR,      ptr:"", NULL),
+    CONF_INFO(316, conf.user_menu_script_title[ 7], CONF_CHAR_PTR,      ptr:"", NULL),
+    CONF_INFO(317, conf.user_menu_script_title[ 8], CONF_CHAR_PTR,      ptr:"", NULL),
+    CONF_INFO(318, conf.user_menu_script_title[ 9], CONF_CHAR_PTR,      ptr:"", NULL),
+    CONF_INFO(319, conf.user_menu_script_title[10], CONF_CHAR_PTR,      ptr:"", NULL),
+    CONF_INFO(320, conf.user_menu_script_title[11], CONF_CHAR_PTR,      ptr:"", NULL),
+    CONF_INFO(321, conf.user_menu_script_title[12], CONF_CHAR_PTR,      ptr:"", NULL),
+    CONF_INFO(322, conf.user_menu_script_title[13], CONF_CHAR_PTR,      ptr:"", NULL),
+
     CONF_INFO(1295, conf.scene_script_mode,             CONF_DEF_VALUE,     i:0, conf_change_scene_script),
     CONF_INFO(1296, conf.profile_menu_mode,             CONF_DEF_VALUE,     i:1, conf_change_pmenu_mode),

branches/tsvstar-uitest/core/gui.c

@@ -223 +223 @@
         sprintf(tgtbuf,"%s|%s|%s|%s|\n", insert_as_type, title, conf.script_file,buf);
         add_to_profile_menu(tgtbuf);
+    gui_mbox_init(LANG_MENU_USER_MENU, (int)"Script added to PROFILE menu", MBOX_BTN_OK|MBOX_TEXT_CENTER, NULL);
         ufree(tgtbuf);
 }
@@ -249 +250 @@
 }
 
-
+extern void add_script_to_user_menu( char * , char *);
+
+static void gui_add_script_to_user_menu(int arg) {
+    if ( conf.user_menu_enable==3 )
+        add_script_to_user_menu( conf.script_file ,  script_title );
+        else
+                gui_add_script_to_profmenu(arg);
+}
 
 static const char* gui_script_autostart_modes[]=            { "Off", "On", "Once"};
@@ -261 +269 @@
     MENU_ITEM   (0x5c,LANG_MENU_LUA_RESTART,                MENUITEM_BOOL,                      &conf.debug_lua_restart_on_error,   0 ),
 #endif
-    MENU_ITEM   (0x35,(int)"Add script to profile menu",    MENUITEM_PROC,                      gui_add_script_to_profmenu,    0 ),
+    MENU_ITEM   (0x35,LANG_MENU_USER_MENU_SCRIPT_ADD,       MENUITEM_PROC,                      gui_add_script_to_user_menu, 0 ),
     MENU_ITEM   (0x5d,LANG_MENU_SCRIPT_DEFAULT_VAL,         MENUITEM_PROC,                      gui_load_script_default,    0 ),
     MENU_ITEM(0x5e,LANG_MENU_SCRIPT_PARAM_SET,                          MENUITEM_ENUM,                      gui_script_param_set_enum, &conf.script_param_set ),
@@ -1946 +1954 @@
     static const char* names[]={ "Video", "Display", "Playback", "Video"};
     static const int keys[] = {KEY_PRINT, KEY_DISPLAY, KEY_PLAYBACK, KEY_VIDEO};
-#elif defined(CAMERA_ixus115_elph100hs) 
+#elif defined(CAMERA_ixus115_elph100hs)
     static const char* names[]={ "Playback", "Video", "Set+ZoomIn" };
     static const int keys[] = {KEY_PLAYBACK, KEY_VIDEO, KEY_SET | KEY_ZOOM_IN };
-#elif defined(CAMERA_ixus120_sd940) 
+#elif defined(CAMERA_ixus300_sd4000)
+    static const char* names[]={ "Playback", "Up + Left" };
+    static const int keys[] = {KEY_PLAYBACK, KEY_UP | KEY_LEFT };
+#elif defined(CAMERA_ixus120_sd940) || (CAMERA_ixus100_sd780) || defined(CAMERA_ixus105_sd1300)
     static const char* names[]={ "Display", "Playback" }; 
     static const int keys[] = {KEY_DISPLAY, KEY_PLAYBACK };
@@ -2434 +2445 @@
     {
 #if CAM_HAS_ZOOM_LEVER
-        y = shortcut_text(x, y, SHORTCUT_TOGGLE_RAW,(int)"Infinity Focus", 0, MAKE_COLOR(COLOR_ALT_BG, COLOR_FG));
+        if (SHORTCUT_TOGGLE_RAW != SHORTCUT_SET_INFINITY)
+            y = shortcut_text(x, y, SHORTCUT_TOGGLE_RAW, LANG_HELP_INF_FOCUS, 0, MAKE_COLOR(COLOR_ALT_BG, COLOR_FG));
 #else
-        y = shortcut_text(x, y, SHORTCUT_TOGGLE_RAW,(int)"Chg Focus Factor", 0, MAKE_COLOR(COLOR_ALT_BG, COLOR_FG));
+        y = shortcut_text(x, y, SHORTCUT_TOGGLE_RAW, LANG_HELP_CHG_FOCUS_FACTOR, 0, MAKE_COLOR(COLOR_ALT_BG, COLOR_FG));
 #endif
     }

branches/tsvstar-uitest/core/gui_lang.h

@@ -707 +707 @@
 #define LANG_MENU_MENUEDIT_POPUP                                575
 
-#define LANG_PROFILE_BASE                                               576
-#define LANG_MENU_PROFILE_MANAGER                               577
-#define LANG_MENU_PROFILE_MANAGER_TITLE                 578
-
-#define LANG_MENU_GOTO_PROFMENU                                 579
-#define LANG_MENU_GOTO_MAINMENU                                 580
-#define LANG_EMPTY_STRING                                               581
-
-#define GUI_LANG_ITEMS                          581
+#define LANG_MENU_USER_MENU_SCRIPT_ADD          576
+
+#define LANG_MENU_EDIT_CHG_VAL                  577
+#define LANG_MENU_EDIT_ADJ_FACTOR               578
+#define LANG_MENU_EDIT_CONFIRM                  579
+#define LANG_MENU_EDIT_ON_OFF                   580
+
+#define LANG_HELP_INF_FOCUS                     581
+#define LANG_HELP_CHG_FOCUS_FACTOR              582
+
+#define LANG_PROFILE_BASE                                               583
+#define LANG_MENU_PROFILE_MANAGER                               584
+#define LANG_MENU_PROFILE_MANAGER_TITLE                 585
+
+#define LANG_MENU_GOTO_PROFMENU                                 586
+#define LANG_MENU_GOTO_MAINMENU                                 587
+#define LANG_EMPTY_STRING                                               588
+
+#define GUI_LANG_ITEMS                          588
 
 //-------------------------------------------------------------------

branches/tsvstar-uitest/core/gui_menu.c

@@ -1092 +1092 @@
                 break;
             case MENUITEM_INT:
-                if ( *(curr_menu->menu[imenu].value) < 0 ) 
+                if ( (*(curr_menu->menu[imenu].value) < 0) && (curr_menu->menu[imenu].type & MENUITEM_F_UNSIGNED) ) 
                     strcpy(tbuf,"Off");
                 else
-                sprintf(tbuf, "%d", *(curr_menu->menu[imenu].value));
+                    sprintf(tbuf, "%d", *(curr_menu->menu[imenu].value));
                 gui_menu_draw_value(tbuf, len_int);
                 break;
@@ -1111 +1111 @@
             case MENUITEM_TEXT:
                                 if ( !is_cur_marked )
-                gui_menu_draw_text(lang_str(curr_menu->menu[imenu].text),1);
+                    gui_menu_draw_text(lang_str(curr_menu->menu[imenu].text),1);
                                 else {
                         sprintf(tbuf, "* %s *", lang_str(curr_menu->menu[imenu].text) );
@@ -1255 +1255 @@
                 xx = (w-len)>>1;
         else
-                xx = 0;
+                xx = 4;
 
     draw_filled_rect(x, yy, x+xx, yy+rbf_font_height()-1, bg );
@@ -1268 +1268 @@
         int i;
 
-    count_visible = 8;
+        // Create body
+        static int mbox_map[] =
+                {
+                        (int)"",
+                        0,  // valuename
+                        (int)"",
+                        (int)"",
+                        LANG_MENU_EDIT_CHG_VAL,
+#if CAM_HAS_ZOOM_LEVER
+            LANG_MENU_EDIT_ADJ_FACTOR,
+#endif
+                        LANG_MENU_EDIT_CONFIRM,
+            (int)"",
+            (int)""
+                };
+
+    count_visible = sizeof(mbox_map)/sizeof(mbox_map[0]);
+
+        mbox_map[1] = curr_menu->menu[gui_menu_curr_item].text;
+        if ( curr_menu->menu[gui_menu_curr_item].type & MENUITEM_QUICKDISABLE)
+                mbox_map[count_visible-2] = LANG_MENU_EDIT_ON_OFF;
+    else
+    {
+        mbox_map[count_visible-2] = (int)"";
+        count_visible--;
+    }
+
     y = (camera_screen.height-(count_visible-1)*rbf_font_height())>>1; 
 
@@ -1275 +1301 @@
     gui_menu_disp_incr();
 
-        // Create body
-        static char* mbox_map[] =
-                {
-                        "",
-                        "",  // valuename
-                        "",
-                        0,
-                        "",
-                        "",
-#if CAM_HAS_ZOOM_LEVER
-                        "arrow/jogdial=change value, ZOOM=incrementor",
-#else
-                        "arrow/jogdial=change value",
-#endif
-                        ""   // bottom line
-                };
-
-        mbox_map[1] = lang_str(curr_menu->menu[gui_menu_curr_item].text);
-        if ( curr_menu->menu[gui_menu_curr_item].type & MENUITEM_QUICKDISABLE)
-                mbox_map[7]="DISP=Cancel, MENU=turn on/off, SET=Confirm";
-        else
-                mbox_map[7]="DISP=Cancel, SET=Confirm";
-
         // Display body
     cl = conf.menu_color;
-        for ( yy=y, i=0; i<count_visible; i++, yy += rbf_font_height() ) {
-                if ( !mbox_map[i] )
-                        continue;
-                gui_menuedit_draw_text( lang_str((int)mbox_map[i]), (i<4) );
-        }
+        for ( yy=y, i=0; i<count_visible; i++, yy += rbf_font_height() )
+                if ( mbox_map[i] )
+                gui_menuedit_draw_text( lang_str((int)mbox_map[i]), (i<4) );
 }
 
@@ -1321 +1322 @@
 
         cl = conf.menu_cursor_color;
-                yy = y + 3*rbf_font_height();
+                yy = y + 2*rbf_font_height() + rbf_font_height()/2;
 
                 int* valueptr = menuitem_get_valueptr( curr_menu, gui_menu_curr_item );
                 if (!valueptr)
                         strcpy(tbuf,"---");
-                else if (*valueptr<0)
-                        strcpy(tbuf,"[Off]");
                 else {
                 switch (curr_menu->menu[gui_menu_curr_item].type & MENUITEM_MASK)
                         {
                     case MENUITEM_INT:
-                        sprintf(tbuf, "[%d]", *valueptr);
+                        if ((*valueptr<0) && (curr_menu->menu[gui_menu_curr_item].type & MENUITEM_F_UNSIGNED))
+                                strcpy(tbuf,"[Off]");
+                    else
+                            sprintf(tbuf, "[%d]", *valueptr);
                         break;
                 case MENUITEM_ENUM:
-                    sprintf(tbuf,"[%s]",((enum_callback_func_t*)curr_menu->menu[gui_menu_curr_item].value)(0, curr_menu->menu[gui_menu_curr_item].arg) );
+                        if (*valueptr<0)
+                                strcpy(tbuf,"[Off]");
+                    else
+                        sprintf(tbuf,"[%s]",((enum_callback_func_t*)curr_menu->menu[gui_menu_curr_item].value)(0, curr_menu->menu[gui_menu_curr_item].arg) );
                         break;
                     case MENUITEM_ENUM2:
-                    sprintf(tbuf,"[%s]", gui_change_enum2(&curr_menu->menu[gui_menu_curr_item], 0) );
+                        if (*valueptr<0)
+                                strcpy(tbuf,"[Off]");
+                    else
+                        sprintf(tbuf,"[%s]", gui_change_enum2(&curr_menu->menu[gui_menu_curr_item], 0) );
                                         break;
                                 default:

branches/tsvstar-uitest/core/gui_osd.c

@@ -256 +256 @@
         if (gui_mode==GUI_MODE_ALT && conf.subj_dist_override_koef>1) {
             gui_print_osd_state_string_chr("FACTOR:",gui_subj_dist_override_koef_enum(0,0));
-        }
+    }
     }
     if ((conf.iso_override_value>0 && conf.iso_override_koef && !(conf.override_disable==1))   || gui_mode==GUI_MODE_OSD)
@@ -281 +281 @@
 #endif
     if (conf.override_disable == 1) gui_print_osd_state_string_chr("NO ", "OVERRIDES");
-// TODO: show power
+    // TODO: show power
     if (conf.flash_manual_override && conf.flash_video_override_power>0 ) gui_print_osd_state_string_chr("Flash:", "Manual Override");
 #ifdef OPT_EDGEOVERLAY

branches/tsvstar-uitest/core/gui_user_menu.c

@@ -63 +63 @@
 }
 
+
+void gui_load_user_menu_script(const char *fn) 
+{
+    if (fn) {
+        script_load(fn, SCRIPT_LOAD_LAST_PARAMSET );
+        load_params_names_cfg();
+
+        // exit menu system on the assumption the user will want to run the script just loaded
+
+        gui_set_mode(&altGuiHandler);
+        kbd_reset_autoclicked_key();
+        rinit();
+    }
+}
+
+
+void add_script_to_user_menu( char * fname ,  char * title )
+{
+    int i ;
+    /*
+     * Insert script info at end of existing entries
+     */
+    for(i = 1; i < USER_MENU_ITEMS + 1; i++)
+    {
+        if(!user_submenu_items[i].text)   // insert script title & full filename in next available spot 
+        {
+            strcpy(conf.user_menu_script_file[i-1], fname) ;
+            strcpy(conf.user_menu_script_title[i-1], title) ;
+
+            user_submenu_items[i].symbol = 0x35;
+            user_submenu_items[i].opt_len = 0 ;
+            user_submenu_items[i].type = MENUITEM_PROC;
+            user_submenu_items[i].text = (int) conf.user_menu_script_title[i-1];
+            user_submenu_items[i].value = (int *) gui_load_user_menu_script ;
+            user_submenu_items[i].arg = (int) conf.user_menu_script_file[i-1] ;
+            
+            char buf[200];
+            sprintf(buf,lang_str(LANG_USER_MENU_ITEM_ADDED), lang_str(user_submenu_items[i].text));
+            gui_mbox_init(LANG_MENU_USER_MENU, (int)buf, MBOX_BTN_OK|MBOX_TEXT_CENTER, NULL);
+            return;
+        }
+    }
+    gui_mbox_init(LANG_MENU_USER_MENU, LANG_USER_MENU_FULL, MBOX_BTN_OK|MBOX_TEXT_CENTER, NULL);
+}
+
+
 void del_user_menu_item(int* cur_memnu_item_indx)
 {
@@ -77 +123 @@
     {
         user_submenu_items[i] = user_submenu_items[i+1];
+        strcpy(conf.user_menu_script_file[i-1], conf.user_menu_script_file[i] ) ;
+        strcpy(conf.user_menu_script_title[i-1], conf.user_menu_script_title[i] ) ;
+        if( user_submenu_items[i].value == (int *) gui_load_user_menu_script ) {        
+            user_submenu_items[i].text = (int) conf.user_menu_script_title[i-1];
+            user_submenu_items[i].arg = (int) conf.user_menu_script_file[i-1] ;
+        }
     }
 
@@ -89 +141 @@
 static void move_user_menu_item(int* cur_memnu_item_indx, int dir)
 {
+    int src_index, dst_index ;
+    char tbuff[CONF_STR_LEN];
+        
+    src_index=*cur_memnu_item_indx ;
+    dst_index=*cur_memnu_item_indx + dir;    
+        
     // Move current user menu item up (dir = -1) or down (dir = 1)
-    CMenuItem tmp_menu_item = user_submenu_items[*cur_memnu_item_indx + dir];
-    user_submenu_items[*cur_memnu_item_indx + dir] = user_submenu_items[*cur_memnu_item_indx];
-    user_submenu_items[*cur_memnu_item_indx] = tmp_menu_item;
-    *cur_memnu_item_indx += dir;
+        
+    CMenuItem tmp_menu_item = user_submenu_items[dst_index];
+    user_submenu_items[dst_index] = user_submenu_items[src_index];
+    user_submenu_items[src_index] = tmp_menu_item;
+    
+    src_index-- ; dst_index--;
+   
+    strncpy(tbuff, conf.user_menu_script_file[dst_index],CONF_STR_LEN-1) ;
+    strncpy(conf.user_menu_script_file[dst_index], conf.user_menu_script_file[src_index],CONF_STR_LEN-1) ;    
+    strncpy(conf.user_menu_script_file[src_index], tbuff, CONF_STR_LEN-1);
+            
+    strncpy(tbuff, conf.user_menu_script_title[dst_index],CONF_STR_LEN-1) ;
+    strncpy(conf.user_menu_script_title[dst_index], conf.user_menu_script_title[src_index],CONF_STR_LEN-1) ;
+    strncpy(conf.user_menu_script_title[src_index], tbuff,CONF_STR_LEN-1) ;
+    
+     src_index++ ; dst_index++ ;
+            
+     if( user_submenu_items[src_index].value == (int *) gui_load_user_menu_script ) {        
+        user_submenu_items[src_index].text = (int) conf.user_menu_script_title[src_index-1];
+        user_submenu_items[src_index].arg = (int) conf.user_menu_script_file[src_index-1] ;
+     }
+        
+     if( user_submenu_items[dst_index].value == (int *) gui_load_user_menu_script ) {        
+        user_submenu_items[dst_index].text = (int) conf.user_menu_script_title[dst_index-1];
+        user_submenu_items[dst_index].arg = (int) conf.user_menu_script_file[dst_index-1] ;
+     }
+        
+     *cur_memnu_item_indx += dir;
+
 }
 
@@ -153 +236 @@
 void user_menu_save() {
     int x;
-        for (x=0; x<USER_MENU_ITEMS; x++) {
+    for (x=0; x<USER_MENU_ITEMS; x++) {
                 /*
                  * First entry in user_submenu_items is reserved for the "Main Menu"
                  * conf.user_menu_vars only traks/saves the real user entries.
                  */
-                conf.user_menu_vars[x] = lang_strhash31(user_submenu_items[x+1].text);
-        }
+        
+        if( user_submenu_items[x+1].text )
+        {
+            if ( user_submenu_items[x+1].value ==(int *) gui_load_user_menu_script )
+            {
+                conf.user_menu_vars[x] = -1 ;                                           // flag script entries specially 
+            }
+            else
+            {
+                conf.user_menu_vars[x] = lang_strhash31(user_submenu_items[x+1].text);   // otherwise save a hash
+            }
+        }
+        else
+        {
+            conf.user_menu_vars[x] = 0 ;
+            *(char *)conf.user_menu_script_title[x] = 0;
+            *(char*)conf.user_menu_script_file[x] = 0 ;
+        }
+    } 
 }
 
 void user_menu_restore() {
-    int x;
-        CMenuItem* item=0;
-
-        for (x=0; x<USER_MENU_ITEMS; x++) {
-                /*
-                 * First entry in user_submenu_items is reserved for the "Main Menu"
-                 * conf.user_menu_vars only traks/saves the real user entries.
-                 */
-                 item = find_mnu(&root_menu, conf.user_menu_vars[x]);
-                 if ( item )
-                        user_submenu_items[x+1] = *item;
-        }
-}
+    int x,y ;
+    CMenuItem* item=0;
+    /*
+     * First entry in user_submenu_items is reserved for the "Main Menu"
+     * conf.user_menu_vars only tracks/saves the real user entries.
+     */
+       
+    for (x=0, y=1; x<USER_MENU_ITEMS; x++, y++) {
+       
+        if( conf.user_menu_vars[x] == -1 )              // special flag- there is no hash for script entries
+        {   
+            user_submenu_items[y].symbol = 0x35;        // restore the script entry
+            user_submenu_items[y].opt_len = 0 ;
+            user_submenu_items[y].type = MENUITEM_PROC;
+            user_submenu_items[y].text = (int) conf.user_menu_script_title[x];
+            user_submenu_items[y].value = (int *) gui_load_user_menu_script ;
+            user_submenu_items[y].arg = (int) conf.user_menu_script_file[x] ;  
+        
+        }
+        else
+        { 
+            if(conf.user_menu_vars[x] >0 )              // look up the menu text
+                 item = find_mnu(&root_menu, conf.user_menu_vars[x]);
+            else item = NULL ;
+            
+            if ( item )                                 // add back in if found
+            {
+                user_submenu_items[y] = *item;
+            }
+            else                                        // otherwise clear the menu entry
+            {
+                user_submenu_items[y].text = 0;            
+                break ;                                 // and exit - all done !
+            }
+        }
+    }  
+}
+

branches/tsvstar-uitest/include/conf.h

@@ -384 +384 @@
     int scene_script_mode;              // strhash31 of last called menuitem "mode"
         int profile_menu_mode;          // 0-by default open main menu, 1-by default open profile menu
+
+    // full path & filename
+    char user_menu_script_file[USER_MENU_ITEMS][CONF_STR_LEN];
+    // @title string from file                     
+    char user_menu_script_title[USER_MENU_ITEMS][CONF_STR_LEN];
+
 } Conf;
 

branches/tsvstar-uitest/platform/a580/notes.txt

@@ -12 +12 @@
 NOTES:
 Half Shutter + Left - Sets AFL
-Half Shutter + Right - Toogle OSD on/off
+Half Shutter + Right - Show OSD (On / Off)
 Half Shutter + Up - Sets AEL
-Half Shutter + Down - Toggle Histogram (Don't / Always / Shoot)
-Half Shutter + Menu - Toggle Zebra on/off
-Half Shutter + Display - Disable overrides
+Half Shutter + Down - Disable overrides (Yes / No)
+Half Shutter + Menu - Show Live Histogram (Don't / Always / Shoot)
+Half Shutter + Display - Draw Zebra (On / Off)
 
 In Alt:
-Display - Toogle RAW on/off
-Up - Toogle MF
+Display - Save RAW (DNG /Off)
+Up - Manual Focus (On / Off)
 
 In ALT + Manual mode:
-Display - Sets Infinity
-Down - Sets Hyperfocal
+Display - Sets Infinity Focus
+Down - Sets HyperFocal Focus
 -------
 Adjustable Alt button supported.
@@ -44 +44 @@
 PLEASE TEST:
 -------
-Curves: Seems it works, please test!!!
--------
 SDHC multi-partition boot and swap supported. (Tested with 2GB SD (2MB  FAT12 and FAT32 the rest), can someone test it with a larger card 8GB, 16GB...)
 

branches/tsvstar-uitest/platform/a580/platform_camera.h

@@ -46 +46 @@
 
     #define CAM_DNG_LENS_INFO               { 58,10, 232,10, 26,10, 55,10 } // See comments in camera.h
+        
+    #undef  CAM_MENU_BORDERWIDTH
+    #define CAM_MENU_BORDERWIDTH            10  
+        
     // pattern
     #define cam_CFAPattern                  0x01000201 // Green  Blue  Red  Green

branches/tsvstar-uitest/platform/ixus100_sd780/kbd.c

@@ -21 +21 @@
 static KeyMap keymap[];
 static long last_kbd_key = 0;
+static long alt_mode_key_mask = 0x00000008;
 
 static int aCount=0;
@@ -123 +124 @@
         }
 
+}
+
+void kbd_set_alt_mode_key_mask(long key)
+{
+        int i;
+        for (i=0; keymap[i].hackkey; ++i) {
+                if (keymap[i].hackkey == key) {
+                        alt_mode_key_mask = keymap[i].canonkey;
+                        return;
+                }
+        }
 }
 
@@ -308 +320 @@
 
         //SD780 - Keymap
-        { 0, KEY_UP                 , 0x00000008 },
+        { 0, KEY_UP             , 0x00000008 },
         { 0, KEY_DOWN           , 0x00000004 },
         { 0, KEY_LEFT           , 0x00000001 },
         { 0, KEY_RIGHT          , 0x00000002 },
 
-
         { 1, KEY_SET            , 0x00004000 },
-//      { 1, KEY_PLAY           , 0x00080000 },  //SD780 Play button
         { 1, KEY_MENU           , 0x00000800 },
-//      { 1, KEY_POWER          , 0x00010000 },  //SD780 Power button
+        { 1, KEY_POWER          , 0x00010000 },  //SD780 Power button
+        { 1, KEY_PLAYBACK       , 0x00080000 },  //SD780 Play button
+        { 1, KEY_PRINT          , 0x00080000 }, // <ALT> key
 
         //xxxf --> xxxd when in movie mode by switch
         //xxxxxxx4 --> xxxxxxx5 when in lens extended recording mode
 
-
         { 2, KEY_SHOOT_FULL     , 0x00001001 },
-    { 2, KEY_SHOOT_FULL_ONLY, 0x00001000 },
+        { 2, KEY_SHOOT_FULL_ONLY, 0x00001000 },
         { 2, KEY_SHOOT_HALF     , 0x00000001 },
         { 2, KEY_ZOOM_IN        , 0x00004000 },
         { 2, KEY_ZOOM_OUT       , 0x00002000 },
-        { 2, KEY_PRINT          , 0x00000040 }, //doesn't exist
-        { 2, KEY_DISPLAY        , 0x00000040 }, //swapped for print atm
-                                                                                //We will see if I can make KEY_DISPLAY a long KEY_DISPLAY...
+        { 2, KEY_DISPLAY        , 0x00000040 },
         { 0, 0, 0 }
 };

branches/tsvstar-uitest/platform/ixus100_sd780/notes.txt

@@ -5 +5 @@
 ND filter only, NO iris
 
+<ALT> key is user defined.  Default is a short press on the Playback key. Can also be set to the DISP key.
 
 *** Features known BROKEN or NOT supported:

branches/tsvstar-uitest/platform/ixus100_sd780/platform_camera.h

@@ -34 +34 @@
     #undef  CAM_HAS_MANUAL_FOCUS
     #undef  CAM_HAS_USER_TV_MODES
+
+    #define CAM_ADJUSTABLE_ALT_BUTTON       1
 
     #undef  CAM_REMOTE

branches/tsvstar-uitest/platform/ixus105_sd1300/kbd.c

@@ -11 +11 @@
 } KeyMap;
 
-static long kbd_new_state[3];
-static long kbd_prev_state[3];
-static long kbd_mod_state[3];
+static long kbd_new_state[3] = { 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF };
+static long kbd_prev_state[3] = { 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF };
+static long kbd_mod_state[3] = { 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF };
 
 static long last_kbd_key = 0;
 extern void _GetKbdState(long*);
 
-#define KEYS_MASK0 (0x00000500)
+#define KEYS_MASK0 (0x00000700)
 #define KEYS_MASK1 (0x38000000)
 #define KEYS_MASK2 (0x00005C0B)
@@ -36 +36 @@
 }
 
+// Keymap values for kbd.c. Additional keys may be present, only common values included here.
 static KeyMap keymap[] = {
-        /* tiny bug: key order matters. see kbd_get_pressed_key()
-         * for example
-         */
-
-        { 0, KEY_MENU       , 0x00000400 },
-    { 0, KEY_DISPLAY    , 0x00000100 }, // Playback button
-
-        { 1, KEY_LEFT           , 0x08000000 },
-        { 1, KEY_ZOOM_IN        , 0x20000000 },
-        { 1, KEY_ZOOM_OUT       , 0x10000000 },
-
-        { 2, KEY_SHOOT_FULL     , 0x00005000 }, // 0101
-    { 2, KEY_SHOOT_HALF , 0x00004000 }, // 0100
-        
-        { 2, KEY_UP                 , 0x00000800 },
-        { 2, KEY_DOWN           , 0x00000002 },
-        { 2, KEY_RIGHT          , 0x00000400 },
-        { 2, KEY_SET            , 0x00000001 },
-        { 2, KEY_PRINT          , 0x00000008 },   // I used DISP. key for this.
-    { 0, 0              , 0x00000000 }
+    { 0, KEY_PLAYBACK        ,0x00000100 }, // Found @0xffea7a88, levent 0x601
+    { 0, KEY_PRINT           ,0x00000100 }, // ALT menu on PLAYBACK button
+    { 0, KEY_POWER           ,0x00000200 }, // Found @0xffea7a94, levent 0x600
+    { 0, KEY_MENU            ,0x00000400 }, // Found @0xffea7aa0, levent 0x09
+    { 1, KEY_LEFT            ,0x08000000 }, // Found @0xffea7adc, levent 0x06
+    { 1, KEY_ZOOM_OUT        ,0x10000000 }, // Found @0xffea7ae8, levent 0x03
+    { 1, KEY_ZOOM_IN         ,0x20000000 }, // Found @0xffea7af4, levent 0x02
+    { 2, KEY_SET             ,0x00000001 }, // Found @0xffea7b00, levent 0x08
+    { 2, KEY_DOWN            ,0x00000002 }, // Found @0xffea7b0c, levent 0x05
+    { 2, KEY_DISPLAY         ,0x00000008 }, // Found @0xffea7b18, levent 0x0a
+    { 2, KEY_RIGHT           ,0x00000400 }, // Found @0xffea7b24, levent 0x07
+    { 2, KEY_UP              ,0x00000800 }, // Found @0xffea7b30, levent 0x04
+    { 2, KEY_SHOOT_FULL      ,0x00005000 }, // Found @0xffea7b3c, levent 0x01
+    { 2, KEY_SHOOT_HALF      ,0x00004000 }, // Found @0xffea7b48, levent 0x00
+    { 2, KEY_SHOOT_FULL_ONLY ,0x00001000 }, // Found @0xffea7b3c, levent 0x01
+    { 0, 0, 0 }
 };
 
-
-long __attribute__((naked)) wrap_kbd_p1_f() ;
-
-static void __attribute__((noinline)) mykbd_task_proceed()
-{
-        while (physw_run){
-        _SleepTask(10);
-
-                if (wrap_kbd_p1_f() == 1){ // autorepeat ?
-                        _kbd_p2_f();
-                }
-        }
-}
-
 long __attribute__((naked,noinline)) wrap_kbd_p1_f()
 {
-
         asm volatile(
                 "STMFD   SP!, {R1-R5,LR}\n"
@@ -85 +67 @@
 }
 
+static void __attribute__((noinline)) mykbd_task_proceed()
+{
+        while (physw_run){
+        _SleepTask(10);
+
+                if (wrap_kbd_p1_f() == 1){ // autorepeat ?
+                        _kbd_p2_f();
+                }
+        }
+}
+
+void __attribute__((naked,noinline)) mykbd_task()
+{
+        mykbd_task_proceed();
+        _ExitTask();
+}
 
 void my_kbd_read_keys()
@@ -93 +91 @@
 
         _GetKbdState(kbd_new_state);
-        _kbd_read_keys_r2(kbd_new_state);
 
         if (kbd_process() == 0){
@@ -107 +104 @@
         }
 
+        _kbd_read_keys_r2(kbd_new_state);
+
         usb_remote_key();
 
@@ -121 +120 @@
 /****************/
 
+void kbd_set_alt_mode_key_mask(long key)
+{
+    // not needed
+}
+
 void kbd_key_press(long key)
 {
         int i;
-        for (i=0;keymap[i].hackkey;i++){
-                if (keymap[i].hackkey == key){
+
+        for (i=0;keymap[i].hackkey;i++){
+                if (keymap[i].hackkey == key)
+                {
                         kbd_mod_state[keymap[i].grp] &= ~keymap[i].canonkey;
                         return;

branches/tsvstar-uitest/platform/ixus105_sd1300/lib.c

@@ -4 +4 @@
 void vid_bitmap_refresh()
 {
+/*  NOTE: This was the old method, i think the new one performs better
     extern int enabled_refresh_physical_screen;
     enabled_refresh_physical_screen=1;
     _RefreshPhysicalScreen(1);
+*/
+        extern int full_screen_refresh;
+        extern void _ScreenUnlock();
+        extern void _ScreenLock();
+
+        full_screen_refresh |= 3;
+        _ScreenLock();
+        _ScreenUnlock();
 }
 
@@ -44 +53 @@
 }
 
-int vid_get_viewport_width()
-{
-        return 360;
-}
-
 long vid_get_viewport_height()
 {
@@ -54 +58 @@
 }
 
-// Y multiplier for cameras with 480 pixel high viewports (CHDK code assumes 240)
-int vid_get_viewport_yscale() {
-        return 2;
-}
-
-void *vid_get_viewport_live_fb()
-{
-    return vid_get_viewport_fb();
-}
-

branches/tsvstar-uitest/platform/ixus105_sd1300/notes.txt

@@ -2 +2 @@
 Digic IV, dryos r43
 
-Untested alpha port of alpha SDM code from http://chdk.setepontos.com/index.php?topic=5720.690
-
-tested (not clear which build or by who):
-- loading, drawing
-- some lua stuff
-- exp override
-
 current issues/unfeatures:
-- load script = camera shutdown
-- save raw = camera shutdown (some stub must be wrong) 
 - no video override
-- edge overlay works but disappears soon
-- zebra doesn't seem to be working
-- some other overrides does not seem to work correctly
 - modemap is incomplete/incorrect (see stubs_entry.S)

branches/tsvstar-uitest/platform/ixus105_sd1300/platform_camera.h

@@ -29 +29 @@
     #define CAM_UNCACHED_BIT  0x40000000 // Found @0xffc29e80
     #define CAM_PROPSET                 3
-    #define CAM_NEED_HP                 1
     #define CAM_MULTIPART               1
-    #define CAM_HAS_PLAYBACK_PB         1
-    #define CAM_MOVIE_PLE               1
-    #define CAM_USES_EXMEM              1
-    #define CAM_USE_SET_BUTTON          1 
     #undef  CAM_HAS_MANUAL_FOCUS
     #undef  CAM_CAN_UNLOCK_OPTICAL_ZOOM_IN_VIDEO
@@ -40 +35 @@
     #undef  CAM_VIDEO_CONTROL
     #undef  CAM_USE_ZOOM_FOR_MF
-    #undef CAM_HAS_ERASE_BUTTON
-    #define  CAM_SHOW_OSD_IN_SHOOT_MENU  1
+    #undef  CAM_HAS_ERASE_BUTTON
+    #define CAM_SHOW_OSD_IN_SHOOT_MENU  1
     #define CAM_EXT_TV_RANGE            1
     #define CAM_HAS_ND_FILTER           1
 
-    // pattern
+    // pattern // TODO:
     #define cam_CFAPattern 0x02010100 // Red  Green  Green  Blue
-    // color
-
+    // color  // TODO:
     #define CAM_COLORMATRIX1                               \
       827547, 1000000, -290458, 1000000, -126086, 1000000, \
@@ -54 +48 @@
       5181,   1000000, 48183,   1000000, 245014,  1000000
 
-    #define cam_CalibrationIlluminant1 1 // Daylight
+    #define cam_CalibrationIlluminant1 1 // Daylight  // TODO:
     // cropping
     #define CAM_JPEG_WIDTH  3648
@@ -66 +60 @@
     #define PARAM_CAMERA_NAME 4 // parameter number for GetParameterData
     #undef  CAM_SENSOR_BITS_PER_PIXEL
-    #undef  CAM_WHITE_LEVEL
-    #undef  CAM_BLACK_LEVEL
     #define CAM_SENSOR_BITS_PER_PIXEL   12
-    #define CAM_WHITE_LEVEL             ((1<<CAM_SENSOR_BITS_PER_PIXEL)-1)
-    #define CAM_BLACK_LEVEL             127
-    
 
+    #undef  CAM_BITMAP_WIDTH
+    #define CAM_BITMAP_WIDTH                720 // Actual width of bitmap screen in bytes
+
+    #undef  CAM_USES_ASPECT_CORRECTION
+    #define CAM_USES_ASPECT_CORRECTION      1
+
+    #define CAM_ADJUSTABLE_ALT_BUTTON      1
+
+    #define  CAM_ZEBRA_ASPECT_ADJUST      1
+
+    #define  CAM_STARTUP_CRASH_FILE_OPEN_FIX      1
+

branches/tsvstar-uitest/platform/ixus105_sd1300/sub/100d/boot.c

@@ -8 +8 @@
 const char * const new_sa = &_end;
 
+extern void task_PhySw();
 extern void task_CaptSeq();
 extern void task_InitFileModules();
@@ -17 +18 @@
 { 
         task_t *tcb=(task_t*)((char*)context-offsetof(task_t, context));
-
         // Replace firmware task addresses with ours
+        if(tcb->entry == (void*)task_PhySw)             tcb->entry = (void*)mykbd_task; 
         if(tcb->entry == (void*)task_CaptSeq)                   tcb->entry = (void*)capt_seq_task; 
         if(tcb->entry == (void*)task_InitFileModules)   tcb->entry = (void*)init_file_modules_task;
@@ -27 +28 @@
 void CreateTask_spytask() {
         _CreateTask("SpyTask", 0x19, 0x2000, core_spytask, 0);
-        //_CreateTask("InitCHDKPTP", 0x19, 0x2000, init_chdk_ptp, 0);
 };
 
@@ -292 +292 @@
 }
 
+void __attribute__((naked,noinline)) taskcreate_PhySw_my() {
+        asm volatile(
+                        "STMFD   SP!, {R3-R5,LR}\n"
+                        "LDR     R4, =0x1C20\n"
+                        "LDR     R0, [R4,#0x10]\n"
+                        "CMP     R0, #0\n"
+                        "BNE     loc_FFC2423C\n"
+                        "MOV     R3, #0\n"
+                        "STR     R3, [SP]\n"
+                        "LDR     R3, =mykbd_task\n"             // Changed
+                        //  "MOV     R2, #0x800\n"
+                        "MOV     R2, #0x2000\n"                 // + stack size for new task_PhySw so we don't have to do stack switch
+                        "B       sub_FFC2422C\n"    // Continue code
+"loc_FFC2423C:\n"
+                        "B       sub_FFC2423C\n"    // Continue code
+        );
+}
+
 void __attribute__((naked,noinline)) task_Startup_my() {
      asm volatile (
@@ -298 +316 @@
                  "BL      sub_ffc25418\n"
                  "BL      sub_ffc23638\n"
-                 "BL      sub_ffc2b744\n" //  was commented in a480
+                 "BL      sub_ffc2b744\n"
                  "BL      sub_ffc2b930\n"
                  //"BL      sub_ffc2b7d8\n"    // This should be the DISKBOOT start
@@ -305 +323 @@
                  "BL      sub_ffc2b960\n"
                  "BL      sub_ffc290dc\n"
-                 "BL      CreateTask_spytask\n"
-                 "BL      sub_ffc2bad0\n"// was commented in a480 for "BL      CreateTask_spytask\n"
-                 "BL      sub_ffc24208\n"
+                 "BL      CreateTask_spytask\n" // +
+                             "BL      sub_ffc2bad0\n"
+                 //"BL      sub_ffc24208\n"
+                 "BL      taskcreate_PhySw_my\n"        // +
                  "BL      sub_ffc27744\n"
                  "BL      sub_ffc2bae8\n"
-                 "BL      sub_ffc216a8\n" // was commented in a480
+                 "BL      sub_ffc216a8\n"
                  "BL      sub_ffc23090\n"
                  "BL      sub_ffc2b4e0\n"

branches/tsvstar-uitest/platform/ixus105_sd1300/sub/100d/capt_seq.c

@@ -95 +95 @@
                  "B       loc_ffc5fd00\n"
 "loc_ffc5faf8:\n"
+                 "BL      shooting_expo_iso_override\n"                     // added
                  "BL      sub_ffc6033c\n"
-                 "BL      tv_override\n" // added
+                 "BL      shooting_expo_param_override\n"               // added
                  "BL      sub_ffc5db3c\n"
-// copied over from SX10/SX200
-// added to avoid some incorrect behavior if overrides are used.
-// it can cause some unexpected side effects. In this case, remove this code!
-                 "MOV     R0, #0\n"
-                 "STR     R0, [R4,#0x24]\n"  // fixes overrides  behavior at short shutter press
-// end of added code
                  "LDR     R0, [R4,#0x24]\n"
                  "CMP     R0, #0\n"
@@ -984 +979 @@
                  "BLEQ    sub_FFC0EB14\n"
                  "MOV     R0, R4\n"
-                 "BL      sub_FFD8F4B8\n"
-            //   "BL      apex2us\n"  // +
+            //     "BL      sub_FFD8F4B8\n" // -
+                 "BL      apex2us\n"  // +
                  "MOV     R4, R0\n"
                  // "BL      nullsub_65\n"

branches/tsvstar-uitest/platform/ixus105_sd1300/sub/100d/lib.c

@@ -14 +14 @@
 }
 
+void *vid_get_viewport_live_fb() //TODO:
+{
+  return (void*)vid_get_viewport_fb();
+}

branches/tsvstar-uitest/platform/ixus105_sd1300/sub/100d/stubs_auto.S

@@ -13 +13 @@
 STUB(FFC0A244)
 STUB(FFC0EB14)
+STUB(FFC2422C)
+STUB(FFC2423C)
 STUB(FFC2936C)
 STUB(FFC29BB4)

branches/tsvstar-uitest/platform/ixus105_sd1300/sub/100d/stubs_entry.S

@@ -8 +8 @@
 
 // Values for makefile.inc
+//   PLATFORMOSVER = 43
 //   PLATFORMID = 12788 (0x31f4) // Found @ 0xfffe0130
 //   MAXRAMADDR = 0x03ffffff
@@ -32 +33 @@
 DEF(physw_status                            ,0x0002f100) // Found @0xffc24574
 DEF(physw_run                               ,0x00001c2c) // Found @0xffc241d8
+DEF(physw_sleep_delay                       ,0x00001c2a) // Found @0xffc241d8
 DEF(levent_table                            ,0xffec0320) // Found @0xffec0320
 DEF(FlashParamsTable                        ,0xffefa0e8) // Found @0xffefa0e8
@@ -61 +63 @@
 // Keymap values for kbd.c. Additional keys may be present, only common values included here.
 //static KeyMap keymap[] = {
+//    { 0, KEY_PLAYBACK        ,0x00000100 }, // Found @0xffea7a88, levent 0x601
+//    { 0, KEY_POWER           ,0x00000200 }, // Found @0xffea7a94, levent 0x600
 //    { 0, KEY_MENU            ,0x00000400 }, // Found @0xffea7aa0, levent 0x09
 //    { 1, KEY_LEFT            ,0x08000000 }, // Found @0xffea7adc, levent 0x06
 //    { 1, KEY_ZOOM_OUT        ,0x10000000 }, // Found @0xffea7ae8, levent 0x03
 //    { 1, KEY_ZOOM_IN         ,0x20000000 }, // Found @0xffea7af4, levent 0x02
+//    { 2, KEY_SET             ,0x00000001 }, // Found @0xffea7b00, levent 0x08
 //    { 2, KEY_DOWN            ,0x00000002 }, // Found @0xffea7b0c, levent 0x05
-//    { 2, KEY_SHOOT_FULL      ,0x00005000 }, // Found @0xffea7b3c, levent 0x01
-//    { 2, KEY_SHOOT_HALF      ,0x00004000 }, // Found @0xffea7b48, levent 0x00
-//    { 2, KEY_SET             ,0x00000001 }, // Found @0xffea7b00, levent 0x08
-//    { 2, KEY_SHOOT_FULL_ONLY ,0x00001000 }, // Found @0xffea7b3c, levent 0x01
 //    { 2, KEY_DISPLAY         ,0x00000008 }, // Found @0xffea7b18, levent 0x0a
 //    { 2, KEY_RIGHT           ,0x00000400 }, // Found @0xffea7b24, levent 0x07
 //    { 2, KEY_UP              ,0x00000800 }, // Found @0xffea7b30, levent 0x04
+//    { 2, KEY_SHOOT_FULL      ,0x00005000 }, // Found @0xffea7b3c, levent 0x01
+//    { 2, KEY_SHOOT_HALF      ,0x00004000 }, // Found @0xffea7b48, levent 0x00
+//    { 2, KEY_SHOOT_FULL_ONLY ,0x00001000 }, // Found @0xffea7b3c, levent 0x01
 //    { 0, 0, 0 }
 //};
@@ -101 +105 @@
 NSTUB(DoAFLock                                ,0xffc27fe0) //102
 NSTUB(EnterToCompensationEVF                  ,0xffc28090) //104
-NSTUB(ExecuteEventProcedure                   ,0xffc6cef0) //  1
+NSTUB(ExecuteEventProcedure                   ,0xffc6cef0) //  2
 NSTUB(ExitFromCompensationEVF                 ,0xffc280d4) //104
 NSTUB(ExitTask                                ,0xffc0eacc) //101
@@ -120 +124 @@
 NSTUB(GetCurrentAvValue                       ,0xffd14ed4) //102
 NSTUB(GetDrive_ClusterSize                    ,0xffc55b18) //  4
-NSTUB(GetDrive_FreeClusters                   ,0xffc24258) //  3
-// ALT: NSTUB(GetDrive_FreeClusters, 0xffc55b78) // 4 9/0
 NSTUB(GetDrive_TotalClusters                  ,0xffc55b4c) //  3
 NSTUB(GetFocusLensSubjectDistance             ,0xffd14174) //102
@@ -132 +134 @@
 NSTUB(GetPropertyCase                         ,0xffc70bfc) //102
 NSTUB(GetSystemTime                           ,0xffe1bd7c) //101
+NSTUB(GetVRAMHPixelsSize                      ,0xffcbe1e8) //102
+NSTUB(GetVRAMVPixelsSize                      ,0xffcbe1f4) //102
 NSTUB(GetZoomLensCurrentPoint                 ,0xffd17f9c) //102
 NSTUB(GetZoomLensCurrentPosition              ,0xffe134c8) //102

branches/tsvstar-uitest/platform/ixus105_sd1300/sub/100d/stubs_entry_2.S

@@ -9 +9 @@
 NHSTUB(SetZoomActuatorSpeedPercent, NULL_SUB)
 
+NHSTUB(GetDrive_FreeClusters, 0xffc55b78)

branches/tsvstar-uitest/platform/ixus300_sd4000/kbd.c

@@ -22 +22 @@
 #define KEYS_MASK1 (0x00000FF0)     // physw_status[1], override 0xF0 (keys) + 0xF00 (feather)
 #define KEYS_MASK2 (0x00000000)     // physw_status[2]
-//static long alt_mode_key_mask = 0x00000000;   // we use two Keys, no need to override
+static long alt_mode_key_mask = 0x00000000;
 
 #define SD_READONLY_FLAG    (0x00020000)    // SD-Card Lock Status (locked / unlocked)
@@ -108 +108 @@
 }
 
+void kbd_set_alt_mode_key_mask(long key)
+{
+        int i;
+        for (i=0; keymap[i].hackkey; ++i) {
+                if (keymap[i].hackkey == key) {
+                        alt_mode_key_mask = keymap[i].canonkey;
+                        return;
+                }
+        }
+}
 
 void kbd_key_press(long key) {
@@ -283 +293 @@
     { 0, KEY_LEFT       , 0x00000008 },
     { 0, KEY_RIGHT      , 0x00000002 },
-    { 1, KEY_SET        , 0x00000040 },
+    { 0, KEY_POWER      , 0x00000010 },
+    { 0, KEY_PLAYBACK   , 0x00004000 },    
+    { 0, KEY_PRINT      , 0x00004000 },   // ALT Key = PLAYBACK - other workaround: KEY_UP + KEY_LEFT (camera has no print key)
     { 0, KEY_SHOOT_FULL , 0x00000900 },   // 0x00000800 (KEY_SHOOT_FULL_ONLY) + 0x00000100 (KEY_SHOOT_HALF)
     { 0, KEY_SHOOT_FULL_ONLY, 0x00000800 },
     { 0, KEY_SHOOT_HALF , 0x00000100 },
+    { 1, KEY_SET        , 0x00000040 },
     { 1, KEY_ZOOM_IN    , 0x00000010 },
     { 1, KEY_ZOOM_OUT   , 0x00000020 },
     { 1, KEY_MENU       , 0x00000080 },
-    { 0, KEY_PRINT      , 0x0000000C },   // ALT Key workaround: KEY_UP + KEY_LEFT (camera has no print key)
     { 0, 0, 0 }
 };

branches/tsvstar-uitest/platform/ixus300_sd4000/notes.txt

@@ -23 +23 @@
 
 --- CHDK ALT Mode ---------------------------------------------------
-To enter CHDK ALT mode press LEFT + UP on JogDial (Camera has no special button like Print for CHDK).
+Camera has a user defined <ALT> key.  Default is a short press on the Playback button. Alternative is tp
+press LEFT + UP on JogDial (Camera has no special button like Print for CHDK).
 
 

branches/tsvstar-uitest/platform/ixus300_sd4000/platform_camera.h

@@ -53 +53 @@
     #define CAM_DATE_FOLDER_NAMING          1
     //#define CAM_DRAW_EXPOSITION             1      // not required because Canon Firmware does always show it on Shutter half press
-    //#define CAM_ADJUSTABLE_ALT_BUTTON       1      // ToDo
+    #define CAM_ADJUSTABLE_ALT_BUTTON       1      
 
     #define PARAM_CAMERA_NAME               4        // parameter number for GetParameterData to get camera name

branches/tsvstar-uitest/platform/s100/platform_camera.h

@@ -36 +36 @@
     #define CAM_HAS_JOGDIAL                 1
     #undef  CAM_HAS_ERASE_BUTTON
+    #define CAM_KEY_CLICK_DELAY             10 // camera requires additional delay for click command
 
     #define CAM_ADJUSTABLE_ALT_BUTTON       1