From 3881b3c964733c3c7235695e75ae5985ff184fc0 Mon Sep 17 00:00:00 2001
From: Perry Werneck <perry.werneck@gmail.com>
Date: Mon, 9 Dec 2019 10:13:03 -0300
Subject: [PATCH] Working on classic UI.

---
 src/objects/actions/print.c           |   4 ++--
 src/objects/actions/save.c            |   4 ++--
 src/objects/application/application.c |   4 ++--
 ui/application.xml                    |  24 ++++++++++++------------
 ui/window.xml                         | 108 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++--------------------------
 5 files changed, 100 insertions(+), 44 deletions(-)

diff --git a/src/objects/actions/print.c b/src/objects/actions/print.c
index a21c67c..d025112 100644
--- a/src/objects/actions/print.c
+++ b/src/objects/actions/print.c
@@ -81,7 +81,7 @@
 	action->parent.activate = activate_print_screen;
 
 	action->group.id = LIB3270_ACTION_GROUP_ONLINE;
-	action->parent.name = "print_screen";
+	action->parent.name = "print.screen";
 	action->label =  N_( "Print screen" );
 
 	return G_ACTION(action);
@@ -95,7 +95,7 @@
 	action->parent.activate = activate_print_selected;
 
 	action->group.id = LIB3270_ACTION_GROUP_SELECTION;
-	action->parent.name = "print_selected";
+	action->parent.name = "print.selected";
 	action->label =  N_( "Print selected" );
 
 	return G_ACTION(action);
diff --git a/src/objects/actions/save.c b/src/objects/actions/save.c
index f6e6d46..848b545 100644
--- a/src/objects/actions/save.c
+++ b/src/objects/actions/save.c
@@ -80,7 +80,7 @@
 	action->parent.activate = activate_save_screen;
 
 	action->group.id = LIB3270_ACTION_GROUP_ONLINE;
-	action->parent.name = "save_screen";
+	action->parent.name = "save.screen";
 	action->label =  N_( "Save screen" );
 
 	return G_ACTION(action);
@@ -94,7 +94,7 @@
 	action->parent.activate = activate_save_selected;
 
 	action->group.id = LIB3270_ACTION_GROUP_SELECTION;
-	action->parent.name = "save_selected";
+	action->parent.name = "save.selected";
 	action->label =  N_( "Save selected" );
 
 	return G_ACTION(action);
diff --git a/src/objects/application/application.c b/src/objects/application/application.c
index ebe36ab..0e85d25 100644
--- a/src/objects/application/application.c
+++ b/src/objects/application/application.c
@@ -308,13 +308,13 @@
 	} conditional_actions[] = {
 		{
 			.label = N_("Save copy"),
-			.action_name = "save_copy",
+			.action_name = "save.copy",
 			.property_name = "has_copy",
 			.activate = pw3270_application_save_copy_activated
 		},
 		{
 			.label = N_("Print copy"),
-			.action_name = "print_copy",
+			.action_name = "print.copy",
 			.property_name = "has_copy",
 			.activate = pw3270_application_print_copy_activated
 		}
diff --git a/ui/application.xml b/ui/application.xml
index 6695f3b..4d67f32 100644
--- a/ui/application.xml
+++ b/ui/application.xml
@@ -84,17 +84,17 @@
 
 				<item>
 					<attribute name="label" translatable="yes">Save screen</attribute>
-					<attribute name="action">win.save_screen</attribute>
+					<attribute name="action">win.save.screen</attribute>
 				</item>
 
 				<item>
 					<attribute name="label" translatable="yes">Save selected</attribute>
-					<attribute name="action">win.save_selected</attribute>
+					<attribute name="action">win.save.selected</attribute>
 				</item>
 
 				<item>
 					<attribute name="label" translatable="yes">Save copy</attribute>
-					<attribute name="action">win.save_copy</attribute>
+					<attribute name="action">win.save.copy</attribute>
 				</item>
 
 			</section>
@@ -102,18 +102,18 @@
 			<section>
 
 				<item>
-					<attribute name="label" translatable="yes">Print</attribute>
-					<attribute name="action">win.print</attribute>
+					<attribute name="label" translatable="yes">Print Screen</attribute>
+					<attribute name="action">win.print.screen</attribute>
 				</item>
 
 				<item>
 					<attribute name="label" translatable="yes">Print selected</attribute>
-					<attribute name="action">win.print_selected</attribute>
+					<attribute name="action">win.print.selected</attribute>
 				</item>
 
 				<item>
 					<attribute name="label" translatable="yes">Print copy</attribute>
-					<attribute name="action">win.print_copy</attribute>
+					<attribute name="action">win.print.copy</attribute>
 				</item>
 
 			</section>
@@ -362,6 +362,11 @@
 				</item>
 
 				<item>
+					<attribute name="label" translatable="yes">Cross hair cursor</attribute>
+					<attribute name="action">win.crosshair</attribute>
+				</item>
+
+				<item>
 					<attribute name="label" translatable="yes">Resize on alternate screen</attribute>
 					<attribute name="action">win.altscreen</attribute>
 				</item>
@@ -372,11 +377,6 @@
 				</item>
 
 				<item>
-					<attribute name="label" translatable="yes">Cross hair cursor</attribute>
-					<attribute name="action">win.crosshair</attribute>
-				</item>
-
-				<item>
 					<attribute name="label" translatable="yes">Blank Fill</attribute>
 					<attribute name="action">win.blankfill</attribute>
 				</item>
diff --git a/ui/window.xml b/ui/window.xml
index a59752c..5e2061e 100644
--- a/ui/window.xml
+++ b/ui/window.xml
@@ -98,12 +98,12 @@
 
 				<item>
 					<attribute name="label" translatable="yes">Save selected</attribute>
-					<attribute name="action">win.save_selected</attribute>
+					<attribute name="action">win.save.selected</attribute>
 				</item>
 
 				<item>
 					<attribute name="label" translatable="yes">Print selected</attribute>
-					<attribute name="action">win.print_selected</attribute>
+					<attribute name="action">win.print.selected</attribute>
 				</item>
 
 				<item>
@@ -148,20 +148,43 @@
 
 			<attribute name='label' translatable='yes'>Options</attribute>
 
-			<item>
-				<attribute name="label" translatable="yes">Show toolbar</attribute>
-				<attribute name="action">win.toolbar</attribute>
-			</item>
+			<section>
 
-			<item>
-				<attribute name="label" translatable="yes">Show menu</attribute>
-				<attribute name="action">win.menubar</attribute>
-			</item>
+				<item>
+					<attribute name="label" translatable="yes">Select by rectangles</attribute>
+					<attribute name="action">win.rectselect</attribute>
+				</item>
 
-			<item>
-				<attribute name="label" translatable="yes">Full screen</attribute>
-				<attribute name="action">win.fullscreen</attribute>
-			</item>
+				<item>
+					<attribute name="label" translatable="yes">Paste with left margin</attribute>
+					<attribute name="action">win.marginedpaste</attribute>
+				</item>
+
+				<item>
+					<attribute name="label" translatable="yes">Blank Fill</attribute>
+					<attribute name="action">win.blankfill</attribute>
+				</item>
+
+			</section>
+
+			<section>
+
+				<item>
+					<attribute name="label" translatable="yes">Show toolbar</attribute>
+					<attribute name="action">win.toolbar</attribute>
+				</item>
+
+				<item>
+					<attribute name="label" translatable="yes">Show menu</attribute>
+					<attribute name="action">win.menubar</attribute>
+				</item>
+
+				<item>
+					<attribute name="label" translatable="yes">Full screen</attribute>
+					<attribute name="action">win.fullscreen</attribute>
+				</item>
+
+			</section>
 
 		</submenu>
 
@@ -256,6 +279,16 @@
 	</submenu>
 
 	<item>
+		<attribute name="label" translatable="yes">Save screen</attribute>
+		<attribute name="action">win.save.screen</attribute>
+	</item>
+
+	<item>
+		<attribute name="label" translatable="yes">Print screen</attribute>
+		<attribute name="action">win.print.screen</attribute>
+	</item>
+
+	<item>
 		<attribute name="label" translatable="yes">Send/Receive files</attribute>
 		<attribute name="action">win.file.transfer</attribute>
 	</item>
@@ -264,20 +297,43 @@
 
 		<attribute name='label' translatable='yes'>Options</attribute>
 
-		<item>
-			<attribute name="label" translatable="yes">Show toolbar</attribute>
-			<attribute name="action">win.toolbar</attribute>
-		</item>
+		<section>
 
-		<item>
-			<attribute name="label" translatable="yes">Show menu</attribute>
-			<attribute name="action">win.menubar</attribute>
-		</item>
+				<item>
+					<attribute name="label" translatable="yes">Select by rectangles</attribute>
+					<attribute name="action">win.rectselect</attribute>
+				</item>
 
-		<item>
-			<attribute name="label" translatable="yes">Full screen</attribute>
-			<attribute name="action">win.fullscreen</attribute>
-		</item>
+				<item>
+					<attribute name="label" translatable="yes">Paste with left margin</attribute>
+					<attribute name="action">win.marginedpaste</attribute>
+				</item>
+
+				<item>
+					<attribute name="label" translatable="yes">Blank Fill</attribute>
+					<attribute name="action">win.blankfill</attribute>
+				</item>
+
+		</section>
+
+		<section>
+
+			<item>
+				<attribute name="label" translatable="yes">Show toolbar</attribute>
+				<attribute name="action">win.toolbar</attribute>
+			</item>
+
+			<item>
+				<attribute name="label" translatable="yes">Show menu</attribute>
+				<attribute name="action">win.menubar</attribute>
+			</item>
+
+			<item>
+				<attribute name="label" translatable="yes">Full screen</attribute>
+				<attribute name="action">win.fullscreen</attribute>
+			</item>
+
+		</section>
 
 	</submenu>
 
--
libgit2 0.21.2