Language improvements.

gabordemooij · Aug 13, 2024 · 88493bb · 88493bb
1 parent 0a0be8f
commit 88493bb
Show file tree

Hide file tree

Showing 4 changed files with 36 additions and 19 deletions.
diff --git a/docs/brondocmedia.ctr b/docs/brondocmedia.ctr
@@ -106,11 +106,6 @@ blokken elk: { :nummer :blok
 
 		☞ vertaalde definitie ≔ Programma opdrachtregel: commando.
 
-		(taal = “nl”) ja: {
-			✎ schrĳf: commando, stop.
-			✎ schrĳf: vertaalde definitie, stop.
-			Programma einde.
-		}.
 
 		commando ≔ 
 		“../bin/Linux/ctren -t ../plugins/media/dict/en🠶taal.dict /tmp/mdoc🠶taal/code.ctr 1>/tmp/mdoc🠶taal/run.ctr 2>/dev/null”.

diff --git a/plugins/media/i18n/en/media.h b/plugins/media/i18n/en/media.h
@@ -40,8 +40,8 @@
 #define CTR_DICT_EDITABLE_SET               "editable:"
 #define CTR_DICT_FONT_SET                   "font:"
 #define CTR_DICT_LINEHEIGHT_SET             "line-height:"
-#define CTR_DICT_COLOR_SET                  "color:"
-#define CTR_DICT_BACKGROUND_COLOR_SET       "background-color:"
+#define CTR_DICT_COLOR_SET                  "ink:"
+#define CTR_DICT_BACKGROUND_COLOR_SET       "highlight:"
 #define CTR_DICT_DRAW_COLOR_SET             "draw:color:"
 #define CTR_DICT_FROM                       "from"
 #define CTR_DICT_TO                         "to"
@@ -56,6 +56,7 @@
 #define CTR_DICT_AUDIO_SILENCE              "silence"
 #define CTR_DICT_AUDIO_REWIND               "rewind"
 #define CTR_DICT_XY_SET                     "x:y:"
+#define CTR_DICT_VISIBLE_SET                 "visible:"
 #define CTR_DICT_WIDTH_HEIGHT_SET           "width:height:"
 #define CTR_DICT_ALIGN_XY_SET               "align-x:y:"
 #define CTR_DICT_MOVE_TO_XY_SET             "to-x:y:"
@@ -64,7 +65,7 @@
 #define CTR_DICT_Y                          "y?"
 #define CTR_DICT_SOURCE_SIZE_SET            "source:size:"
 #define CTR_DICT_FONTSCRIPT_TXTDIR_SET      "text-style:direction:"
-#define CTR_DICT_DIALOG_SET                 "notification:"
+#define CTR_DICT_DIALOG_SET                 "show:"
 #define CTR_DICT_CLIPBOARD_SET              "clipboard:"
 #define CTR_DICT_FROM_TO_SET                "from:to:"
 #define CTR_DICT_RED_GREEN_BLUE_SET         "red:green:blue:"

diff --git a/plugins/media/i18n/nl/media.h b/plugins/media/i18n/nl/media.h
@@ -27,7 +27,7 @@
 #define CTR_DICT_BLUE                       "blauw"
 #define CTR_DICT_TRANSPARENCY               "transparantie"
 #define CTR_DICT_SOURCE_SET                 "bron:"
-#define CTR_DICT_CONTROLLABLE               "bestuurbaar:"
+#define CTR_DICT_CONTROLLABLE               "besturing:"
 #define CTR_DICT_SOLID_SET                  "muur:"
 #define CTR_DICT_ACTIVE_SET                 "actief:"
 #define CTR_DICT_GRAVITY_SET                "zwaartekracht:"
@@ -40,8 +40,8 @@
 #define CTR_DICT_EDITABLE_SET               "beschrijfbaar:"
 #define CTR_DICT_FONT_SET                   "lettertype:"
 #define CTR_DICT_LINEHEIGHT_SET             "regelhoogte:"
-#define CTR_DICT_COLOR_SET                  "kleur:"
-#define CTR_DICT_BACKGROUND_COLOR_SET       "achtergrondskleur:"
+#define CTR_DICT_COLOR_SET                  "inkt:"
+#define CTR_DICT_BACKGROUND_COLOR_SET       "stift:"
 #define CTR_DICT_DRAW_COLOR_SET             "tekenen:kleur:"
 #define CTR_DICT_FROM                       "vanuit"
 #define CTR_DICT_TO                         "naar"
@@ -56,6 +56,7 @@
 #define CTR_DICT_AUDIO_SILENCE              "stil"
 #define CTR_DICT_AUDIO_REWIND               "terugspoelen"
 #define CTR_DICT_XY_SET                     "x:y:"
+#define CTR_DICT_VISIBLE_SET                "zichtbaar:"
 #define CTR_DICT_WIDTH_HEIGHT_SET           "breedte:hoogte:"
 #define CTR_DICT_ALIGN_XY_SET               "uitlijnen-x:y:"
 #define CTR_DICT_MOVE_TO_XY_SET             "naar-x:y:"
@@ -64,7 +65,7 @@
 #define CTR_DICT_Y                          "y?"
 #define CTR_DICT_SOURCE_SIZE_SET            "bron:grootte:"
 #define CTR_DICT_FONTSCRIPT_TXTDIR_SET      "schrijfwijze:richting:"
-#define CTR_DICT_DIALOG_SET                 "melding:"
+#define CTR_DICT_DIALOG_SET                 "toon:"
 #define CTR_DICT_CLIPBOARD_SET              "klembord:"
 #define CTR_DICT_FROM_TO_SET                "vanuit:naar:"
 #define CTR_DICT_RED_GREEN_BLUE_SET         "rood:groen:blauw:"

diff --git a/plugins/media/media.c b/plugins/media/media.c
@@ -119,6 +119,7 @@ struct MediaIMG {
 	char            ghost;
 	char            nodirani;
 	int             lineheight;
+	char            visible;
 };
 typedef struct MediaIMG MediaIMG;
 
@@ -1272,7 +1273,7 @@ ctr_object* ctr_media_screen(ctr_object* myself, ctr_argument* argumentList) {
 	CtrMediaSelectStart =0;
 	CtrMediaSelectBegin = 0;
 	CtrMediaSelectEnd=0;
-	controllableObject = NULL;
+	//controllableObject = NULL;
 	focusObject = NULL;
 	CtrMediaSteps = 0;
 	SDL_Rect dimensions;
@@ -1617,6 +1618,7 @@ ctr_object* ctr_media_screen(ctr_object* myself, ctr_argument* argumentList) {
 		CtrMediaTicks2 = SDL_GetTicks64();
 		for(int i = 0; i < IMGCount; i ++) {
 			MediaIMG* m = &mediaIMGs[i];
+			if (!m->visible) continue;
 			ctr_internal_media_image_calculate_motion(m);
 			SDL_Rect r,s;
 			r = ctr_internal_media_image_maprect(m);
@@ -2224,6 +2226,7 @@ ctr_object* ctr_img_new(ctr_object* myself, ctr_argument* argumentList) {
 	mediaImage->gspeed = 0;
 	mediaImage->dir = -1;
 	mediaImage->mov = 0;
+	mediaImage->visible = 1;
 	mediaImage->anims = 1;
 	mediaImage->animspeed = 5;
 	mediaImage->nodirani = 0;
@@ -2322,6 +2325,22 @@ ctr_object* ctr_img_ghost_set(ctr_object* myself, ctr_argument* argumentList) {
 	return myself;
 }
 
+/**
+ * @def
+ * [ Image ] visible: [ Boolean ]
+ * 
+ * @example
+ * image visible: True.
+ * 
+ * @result
+ * @info-image-visible
+ */
+ctr_object* ctr_img_visible_set(ctr_object* myself, ctr_argument* argumentList) {
+	MediaIMG* mediaImage = ctr_internal_get_image_from_object(myself);
+	mediaImage->visible = ctr_internal_cast2bool( argumentList->object )->value.bvalue;
+	return myself;
+}
+
 /**
  * @def
  * [ Image ] fixate: [ Boolean ]
@@ -2626,11 +2645,11 @@ ctr_object* ctr_img_anims(ctr_object* myself, ctr_argument* argumentList) {
 
 /**
  * @def
- * [ Image ] color: [ Color ]
+ * [ Image ] ink: [ Color ]
  * 
  * @example
  * >> red := Color new red: 255 green: 0 blue: 0.
- * image color: red.
+ * image ink: red.
  * 
  * @result
  * @info-image-color
@@ -2648,11 +2667,11 @@ ctr_object* ctr_img_color(ctr_object* myself, ctr_argument* argumentList) {
 
 /**
  * @def
- * [ Image ] background-color: [ Color ]
+ * [ Image ] highlight: [ Color ]
  * 
  * @example
  * >> green := Color new red: 0 green: 255 blue: 0.
- * image background-color: green.
+ * image highlight: green.
  * 
  * @result
  * @info-image-background-color
@@ -4096,10 +4115,10 @@ ctr_object* ctr_media_datastart(ctr_object* myself, ctr_argument* none) {
 
 /**
  * @def
- * [ Media ] notification: [ Text ]
+ * [ Media ] show: [ Text ]
  * 
  * @example
- * Media notification: ['TEST 123'].
+ * Media show: ['TEST 123'].
  * 
  * @result
  * @info-media-notification
@@ -4214,6 +4233,7 @@ void begin(){
 	ctr_internal_create_func(imageObject, ctr_build_string_from_cstring( CTR_DICT_LINEHEIGHT_SET ), &ctr_img_lineheight );
 	ctr_internal_create_func(imageObject, ctr_build_string_from_cstring( CTR_DICT_XY_SET ), &ctr_img_xy );
 	ctr_internal_create_func(imageObject, ctr_build_string_from_cstring( CTR_DICT_MOVE_TO_XY_SET ), &ctr_img_mov_set );
+	ctr_internal_create_func(imageObject, ctr_build_string_from_cstring( CTR_DICT_VISIBLE_SET ), &ctr_img_visible_set );
 	fontObject = ctr_font_new(CtrStdObject, NULL);
 	fontObject->link = CtrStdObject;
 	ctr_internal_create_func(fontObject, ctr_build_string_from_cstring( CTR_DICT_NEW ), &ctr_font_new );