Addin property with the OIA-Timer state.

Perry Werneck
1 parent ecc977ad
Showing 6 changed files with 39 additions and 16 deletions Show diff stats
locale/pt_BR.po
src/include/terminal.h
src/terminal/drawing/oia.c
src/terminal/properties/get.c
src/terminal/properties/init.c
src/terminal/properties/private.h
@@ -5,7 +5,7 @@ msgid &quot;&quot;
 msgstr ""
 "Project-Id-Version: pw3270 5.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-07-06 16:11-0300\n"
+"POT-Creation-Date: 2020-07-16 15:51-0300\n"
 "PO-Revision-Date: 2020-07-06 16:12-0300\n"
 "Last-Translator: Perry Werneck <perry.werneck@gmail.com>\n"
 "Language-Team: Português <>\n"
@@ -59,15 +59,15 @@ msgstr &quot;_Adicionar ao arquivo&quot;
 msgid "About security"
 msgstr "Sobre a segurança"
-#: src/dialogs/settings/accelerator.c:191
+#: src/dialogs/settings/accelerator.c:196
 msgid "Accelerator"
 msgstr "Atalho"
-#: src/dialogs/settings/accelerator.c:329
+#: src/dialogs/settings/accelerator.c:334
 msgid "Accelerator is in use"
 msgstr "Atalho está em uso"
-#: src/dialogs/settings/accelerator.c:240
+#: src/dialogs/settings/accelerator.c:245
 msgid "Accelerators"
 msgstr "Atalhos"
@@ -88,7 +88,7 @@ msgstr &quot;Adicionar à cópia&quot;
 msgid "Address or name of the host to connect."
 msgstr "Endereço ou nome do host a conectar."
-#: src/dialogs/settings/accelerator.c:201
+#: src/dialogs/settings/accelerator.c:206
 msgid "Alternative"
 msgstr "Alternativa"
@@ -120,7 +120,7 @@ msgstr &quot;Adiciona seleção na área de transferência&quot;
 msgid "Appends the source file to the destination file."
 msgstr "Adiciona conteúdo do arquivo origem ao final do arquivo destino."
-#: src/dialogs/settings/accelerator.c:311
+#: src/dialogs/settings/accelerator.c:316
 #, c-format
 msgid "Assign it to action (<b>%s</b>)?"
 msgstr "Associar com a ação (<b>%s</b>)?"
@@ -613,8 +613,8 @@ msgstr &quot;Escopo de mapeamento inválido&quot;
 msgid "Invalid state"
 msgstr "Estado inválido"
-#: src/dialogs/settings/accelerator.c:145
-#: src/dialogs/settings/accelerator.c:239
+#: src/dialogs/settings/accelerator.c:150
+#: src/dialogs/settings/accelerator.c:244
 msgid "Keyboard accelerators"
 msgstr "Atalhos de teclado"
@@ -670,7 +670,7 @@ msgstr &quot;Monocromático&quot;
 msgid "Mustard"
 msgstr "Mostarda"
-#: src/dialogs/settings/accelerator.c:153
+#: src/dialogs/settings/accelerator.c:158
 msgid "Name"
 msgstr "Nome"
@@ -950,7 +950,7 @@ msgstr &quot;Formato de registro&quot;
 msgid "Red"
 msgstr "Vermelho"
-#: src/dialogs/settings/accelerator.c:454
+#: src/dialogs/settings/accelerator.c:459
 msgid "Rejected by action"
 msgstr "Rejeitado pela ação"
@@ -1257,7 +1257,7 @@ msgstr &quot;Tipo de situação&quot;
 msgid "State of the dynamic font spacing"
 msgstr "Estado do espaçamento dinâmico"
-#: src/dialogs/settings/accelerator.c:171
+#: src/dialogs/settings/accelerator.c:176
 msgid "Summary"
 msgstr "Sumário"
@@ -1304,7 +1304,7 @@ msgstr &quot;&quot;
 msgid "The EBCDIC host character set. "
 msgstr "A tabela de caracteres EBCDIC."
-#: src/dialogs/settings/accelerator.c:450
+#: src/dialogs/settings/accelerator.c:455
 #, c-format
 msgid "The action \"%s\" can't manage alternative keys"
 msgstr "A ação \"%s\" não permite uso de atalho alternativo"
@@ -1389,12 +1389,12 @@ msgstr &quot;Operação de impressão está em andamento&quot;
 msgid "The print settings should be stored."
 msgstr "Configuração de impressão deve ser armazenada"
-#: src/dialogs/settings/accelerator.c:304
+#: src/dialogs/settings/accelerator.c:309
 #, c-format
 msgid "The selected accelerator is in use by action <b>%s</b> (<b>%s</b>)"
 msgstr "O atalho selecionado está em uso pela ação <b>%s</b> (<b>%s</b>)"
-#: src/dialogs/settings/accelerator.c:324
+#: src/dialogs/settings/accelerator.c:329
 msgid "The selected accelerator is in use by the same action"
 msgstr "O atalho selecionado está em uso na mesma ação"
@@ -78,6 +78,7 @@ G_BEGIN_DECLS
 		GParamSpec * session_name;
 		GParamSpec * trace;
 		GParamSpec * has_copy;
+		GParamSpec * has_timer;
 		struct
 		{
@@ -827,6 +827,7 @@ struct timer_info
 static void release_timer(struct timer_info *info)
 {
 	info->terminal->timer = NULL;
+	g_object_notify_by_pspec(G_OBJECT(info->terminal),GTK_V3270_GET_CLASS(info->terminal)->properties.has_timer);
 	if(info->terminal->surface)
 	{
@@ -1051,6 +1052,8 @@ void v3270_start_timer(GtkWidget *widget)
 	terminal->timer = g_timeout_source_new(100);
 	g_source_set_callback(terminal->timer,(GSourceFunc) update_timer, info, (GDestroyNotify) release_timer);
+	g_object_notify_by_pspec(G_OBJECT(terminal),GTK_V3270_GET_CLASS(widget)->properties.has_timer);
+
 	g_source_attach(terminal->timer,NULL);
 	g_source_unref(terminal->timer);
@@ -146,6 +146,11 @@
 		case V3270_PROPERTY_HAS_COPY:
 			g_value_set_boolean(value,window->selection.blocks != NULL);
 			break;
+
+		case V3270_PROPERTY_HAS_TIMER:
+			g_value_set_boolean(value,window->timer != NULL);
+			break;
+
 		default:
 			G_OBJECT_WARN_INVALID_PROPERTY_ID(object, prop_id, pspec);
@@ -242,7 +242,6 @@
 		klass->properties.settings[V3270_SETTING_SELECTION_OPTIONS]
 	);
-
 	klass->properties.has_copy =
 		g_param_spec_boolean(
 			"has_copy",
@@ -258,6 +257,20 @@
 		klass->properties.has_copy
 	);
+	klass->properties.has_timer =
+		g_param_spec_boolean(
+			"has_timer",
+			"has_timer",
+			_( "True if the timer indicator is active" ),
+			FALSE,
+			G_PARAM_READABLE
+		);
+
+	g_object_class_install_property(
+		gobject_class,
+		V3270_PROPERTY_HAS_TIMER,
+		klass->properties.has_timer
+	);
 	//
 	// Create dynamic properties
@@ -59,8 +59,9 @@
 	V3270_PROPERTY_TERMINAL_COLORS		= 10,	///< @brief Terminal colors.
 	V3270_PROPERTY_SELECTION_OPTIONS	= 11,
 	V3270_PROPERTY_HAS_COPY				= 12,	///< @brief Terminal has copy.
+	V3270_PROPERTY_HAS_TIMER			= 13,	///< @brief Timer indicator state.
-	V3270_PROPERTY_DYNAMIC				= 13	///< @brief Id of the first LIB3270 internal property.
+	V3270_PROPERTY_DYNAMIC				= 14	///< @brief Id of the first LIB3270 internal property.
  };
  G_GNUC_INTERNAL void v3270_get_property(GObject *object, guint prop_id, GValue *value, GParamSpec *pspec);
	@@ -78,6 +78,7 @@ G_BEGIN_DECLS		@@ -78,6 +78,7 @@ G_BEGIN_DECLS
78	GParamSpec * session_name;	78	GParamSpec * session_name;
79	GParamSpec * trace;	79	GParamSpec * trace;
80	GParamSpec * has_copy;	80	GParamSpec * has_copy;
		81	+ GParamSpec * has_timer;
81		82
82	struct	83	struct
83	{	84	{
	@@ -242,7 +242,6 @@		@@ -242,7 +242,6 @@
242	klass->properties.settings[V3270_SETTING_SELECTION_OPTIONS]	242	klass->properties.settings[V3270_SETTING_SELECTION_OPTIONS]
243	);	243	);
244		244
245	-
246	klass->properties.has_copy =	245	klass->properties.has_copy =
247	g_param_spec_boolean(	246	g_param_spec_boolean(
248	"has_copy",	247	"has_copy",
	@@ -258,6 +257,20 @@		@@ -258,6 +257,20 @@
258	klass->properties.has_copy	257	klass->properties.has_copy
259	);	258	);
260		259
		260	+ klass->properties.has_timer =
		261	+ g_param_spec_boolean(
		262	+ "has_timer",
		263	+ "has_timer",
		264	+ _( "True if the timer indicator is active" ),
		265	+ FALSE,
		266	+ G_PARAM_READABLE
		267	+ );
		268	+
		269	+ g_object_class_install_property(
		270	+ gobject_class,
		271	+ V3270_PROPERTY_HAS_TIMER,
		272	+ klass->properties.has_timer
		273	+ );
261		274
262	//	275	//
263	// Create dynamic properties	276	// Create dynamic properties