catch up with changes

2025-01-04 23:02:02 +01:00 · 2004-03-03 02:20:34 +00:00 · 2004-03-03 02:20:34 +00:00 · 514575ed2c
commit 514575ed2c
parent addb138891
1 changed files with 79 additions and 24 deletions
--- a/palm/l10n/xwords4_es_ES.rcp.pre
+++ b/palm/l10n/xwords4_es_ES.rcp.pre
@ -21,7 +21,7 @@

 #include "xwords4defines.h"

-#include "Common.rcp.pre"	/* these don't need localization */
+#include "common.rcp.pre"	/* these don't need localization */

 #define LEFTMARGIN 5

@ -54,6 +54,9 @@ BEGIN
    BEGIN
        MENUITEM "Pista" XW_HINT_PULLDOWN_ID "I"
        MENUITEM "Más pistas" XW_NEXTHINT_PULLDOWN_ID "M"
+#ifdef XWFEATURE_HINT_CONFIG
+        MENUITEM "Configure hint..." XW_HINTCONFIG_PULLDOWN_ID "C"
+#endif
 	MENUITEM SEPARATOR
        MENUITEM "Descartar la actual" XW_UNDOCUR_PULLDOWN_ID "U"
        MENUITEM "Descartar la previa" XW_UNDOLAST_PULLDOWN_ID "Z"
@ -64,7 +67,7 @@ BEGIN
        MENUITEM "Ocultar el atril" XW_HIDETRAY_PULLDOWN_ID "H"
    END
 #ifdef FOR_GREMLINS
-    PULLDOWN "Gremlins" 
+    PULLDOWN "Grem" 
    BEGIN
        MENUITEM "divider right" XW_GREMLIN_DIVIDER_RIGHT
        MENUITEM "divider left" XW_GREMLIN_DIVIDER_LEFT
@ -74,11 +77,10 @@ BEGIN

 #ifndef FOR_GREMLINS
 #ifdef DEBUG
-    PULLDOWN "Debug" 
+    PULLDOWN "DBG" 
    BEGIN
        MENUITEM "Show debugstrs" XW_DEBUGSHOW_PULLDOWN_ID
        MENUITEM "Hide debugstrs" XW_DEBUGHIDE_PULLDOWN_ID
-/*         MENUITEM "Reset game" XW_RESET_PULLDOWN_ID */
        MENUITEM "Network stats..." XW_NETSTATS_PULLDOWN_ID
 #ifdef MEM_DEBUG
        MENUITEM "Mem stats..." XW_MEMSTATS_PULLDOWN_ID
@ -256,19 +258,61 @@ BEGIN
    SELECTORTRIGGER "Diccionario..." XW_DICT_SELECTOR_ID \
             AT (PREVRIGHT+12 PREVTOP AUTO AUTO) USABLE LEFTANCHOR

-/*     BUTTON "Dicc..." XW_DICT_BUTTON_ID  */
-
    BUTTON "Aceptar" XW_OK_BUTTON_ID RIGHT@154 PREVTOP 36 AUTO
    BUTTON "Cancelar" XW_CANCEL_BUTTON_ID RIGHT@PREVLEFT-3 PREVTOP 37 AUTO
 END				/* FORM XW_PLAYERINFO_FORM */

+#ifdef BEYOND_IR
 #define LEFTCOL 4
+#define CONNS_FIELD_LEFT 80
+#define LOCALIP_TOP 30
+
+FORM ID XW_CONNS_FORM AT (2 54 156 105)
+USABLE MODAL SAVEBEHIND DEFAULTBTNID XW_CONNS_CANCEL_BUTTON_ID
+BEGIN
+    TITLE "Connections"
+
+    LABEL "Connect via:" AUTOID LEFTCOL 15 FONT 1
+
+    POPUPTRIGGER "" ID XW_CONNS_TYPE_TRIGGER_ID
+        AT (PREVRIGHT+5 PREVTOP 72 12) LEFTANCHOR
+    LIST "IR/Bluetooth" "Internet/IP" ID XW_CONNS_TYPE_LIST_ID 
+        PREVLEFT PREVTOP 72 12 VISIBLEITEMS 2 NONUSABLE
+    POPUPLIST XW_CONNS_TYPE_TRIGGER_ID XW_CONNS_TYPE_LIST_ID 
+
+    /* FYI: not editable!!! */
+    LABEL "Local IP address:" XW_CONNS_HOSTIP_LABEL_ID 
+        AT ( LEFTCOL+10 LOCALIP_TOP )
+    FIELD XW_CONNS_HOSTIP_FIELD_ID PREVRIGHT+5 PREVTOP 70 AUTO \
+        SINGLELINE MAXCHARS 16
+
+     /* Everybody has a listen port */
+    LABEL "Receive port:" XW_CONNS_MYPORT_LABEL_ID
+        AT (LEFTCOL PREVBOTTOM + 2)
+    FIELD XW_CONNS_MYPORT_FIELD_ID CONNS_FIELD_LEFT PREVTOP 30 AUTO \
+        EDITABLE SINGLELINE UNDERLINED NUMERIC MAXCHARS 5
+
+    /* For Guest case */
+    LABEL "Send IP address:" XW_CONNS_TARGET_LABEL_ID 
+        AT (LEFTCOL PREVBOTTOM+2)
+    FIELD XW_CONNS_TARGET_FIELD_ID CONNS_FIELD_LEFT PREVTOP 70 AUTO \
+        EDITABLE SINGLELINE UNDERLINED MAXCHARS 15
+
+    LABEL "Send port:" XW_CONNS_TPORT_LABEL_ID AT (LEFTCOL PREVBOTTOM+2)
+    FIELD XW_CONNS_TPORT_FIELD_ID CONNS_FIELD_LEFT PREVTOP 30 AUTO \
+        EDITABLE SINGLELINE UNDERLINED NUMERIC MAXCHARS 5
+
+    BUTTON "Cancel" XW_CONNS_CANCEL_BUTTON_ID 42 PREVBOTTOM+5 AUTO AUTO 
+    BUTTON "Ok" XW_CONNS_OK_BUTTON_ID PREVRIGHT+10 PREVTOP AUTO AUTO 
+END                             /* XW_CONNS_FORM */
+#endif
+
 #define PREFS_MODE_TOP 15
 #define PREFS_TOP 30
-#define TIMER_TOP 84
-#define BUTTON_TOP 102
+#define TIMER_TOP 72
+#define BUTTON_TOP 99

-FORM ID XW_PREFS_FORM AT (2 39 156 119)
+FORM ID XW_PREFS_FORM AT (2 44 156 115)
 USABLE MODAL SAVEBEHIND DEFAULTBTNID XW_PREFS_CANCEL_BUTTON_ID
 BEGIN
    TITLE "Preferencias"
@ -318,6 +362,11 @@ BEGIN
    FIELD XW_PREFS_TIMER_FIELD_ID PREVRIGHT+5 PREVTOP 15 AUTO UNDERLINED \
        EDITABLE SINGLELINE NUMERIC MAXCHARS 3

+#ifdef FEATURE_TRAY_EDIT
+    CHECKBOX "Allow pick tiles" ID XW_PREFS_PICKTILES_CHECKBOX_ID \
+        AT (LEFTCOL PREVBOTTOM AUTO AUTO) NONUSABLE /* translate me */
+#endif
+
    /* buttons at the bottom */
    BUTTON "Cancelar" XW_PREFS_CANCEL_BUTTON_ID 42 BUTTON_TOP AUTO AUTO 
    BUTTON "Aceptar" XW_PREFS_OK_BUTTON_ID PREVRIGHT+10 PREVTOP AUTO AUTO 
@ -331,9 +380,9 @@ BEGIN

    LABEL "Nombre:" AUTOID AT (LEFT_EDGE 15)
    POPUPTRIGGER "" ID XW_DICTINFO_TRIGGER_ID 
-	AT (PREVRIGHT+5 PREVTOP 72 12) LEFTANCHOR
+	    AT (PREVRIGHT+5 PREVTOP 72 12) LEFTANCHOR
    LIST "" ID XW_DICTINFO_LIST_ID AT (PREVLEFT PREVTOP 72 1)
-	NONUSABLE VISIBLEITEMS 4
+	    NONUSABLE VISIBLEITEMS 4
    POPUPLIST XW_DICTINFO_TRIGGER_ID XW_DICTINFO_LIST_ID

    BUTTON "Aceptar" XW_DICTINFO_DONE_BUTTON_ID 25 31 AUTO AUTO 
@ -348,14 +397,14 @@ MENUID XW_ASK_MENU_ID
 BEGIN
    TITLE "Pregunta"

-    FIELD XW_ASK_TXT_FIELD_ID LEFT_EDGE-5 15 135 52 \
+    FIELD XW_ASK_TXT_FIELD_ID LEFT_EDGE-5 16 135 52 \
          NONEDITABLE MULTIPLELINES

    SCROLLBAR ID XW_ASK_SCROLLBAR_ID
 	AT ( PREVRIGHT+2 PREVTOP RECOMMENDED_SBAR_WIDTH 
 	     PREVBOTTOM - PREVTOP) USABLE 

-    BUTTON "Aceptar" XW_ASK_OK_BUTTON_ID RIGHT@(156/2)-10 PREVBOTTOM+2 AUTO AUTO 
+    BUTTON "Aceptar" XW_ASK_OK_BUTTON_ID RIGHT@(156/2)-10 PREVBOTTOM+5 AUTO AUTO 
    BUTTON "Cancelar" XW_ASK_CANCEL_BUTTON_ID 156/2+10 PREVTOP
 	   AUTO AUTO 
 END
@ -378,21 +427,27 @@ BEGIN
    BUTTON "Cancelar" XW_PASSWORD_CANCEL_BUTTON PREVRIGHT+10 PREVTOP AUTO AUTO
 END

-FORM ID XW_BLANK_DIALOG_ID AT ( 2 89 156 69 ) USABLE 
-    MODAL SAVEBEHIND DEFAULTBTNID XW_BLANK_OK_BUTTON_ID
+#define BLANK_PICK_TOP 15
+
+FORM ID XW_BLANK_DIALOG_ID AT ( 2 74 156 83 ) USABLE 
+    MODAL SAVEBEHIND 
+#ifdef FEATURE_TRAY_EDIT 
+    DEFAULTBTNID XW_BLANK_PICK_BUTTON_ID
+#endif
 BEGIN
-    TITLE "Comodín"
+    TITLE "Tile picker"         /* translate me */

-    LABEL "Escoge la ficha que" AUTOID 10 20 FONT 1
-    LABEL "quieres usar:" AUTOID PREVLEFT PREVBOTTOM FONT 1
+    FIELD XW_BLANK_LABEL_FIELD_ID AT (10 BLANK_PICK_TOP 110 39) 
+        NONEDITABLE MULTIPLELINES

-    POPUPTRIGGER "" ID XW_BLANK_TRIGGER_ID AT (125 20 32 12)
-	LEFTANCHOR
-    LIST "" ID XW_BLANK_LIST_ID AT (PREVLEFT PREVTOP 32 1)
-	NONUSABLE VISIBLEITEMS 14
-    POPUPLIST XW_BLANK_TRIGGER_ID XW_BLANK_LIST_ID
+    LIST "" ID XW_BLANK_LIST_ID AT (PREVRIGHT+2 BLANK_PICK_TOP 28 72)
+        USABLE VISIBLEITEMS 6

-    BUTTON "Aceptar" XW_BLANK_OK_BUTTON_ID CENTER 50 AUTO AUTO
+    BUTTON "Ok" XW_BLANK_OK_BUTTON_ID RIGHT@PREVLEFT-10 65 AUTO AUTO /* translate me */
+
+#ifdef FEATURE_TRAY_EDIT
+    BUTTON "Pick all!" XW_BLANK_PICK_BUTTON_ID 5 65 AUTO AUTO /* translate me */
+#endif
 END

 #if defined OWNER_HASH || defined NO_REG_REQUIRED