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 @@ Save screen - win.save_screen + win.save.screen Save selected - win.save_selected + win.save.selected Save copy - win.save_copy + win.save.copy @@ -102,18 +102,18 @@
- Print - win.print + Print Screen + win.print.screen Print selected - win.print_selected + win.print.selected Print copy - win.print_copy + win.print.copy
@@ -362,6 +362,11 @@ + Cross hair cursor + win.crosshair + + + Resize on alternate screen win.altscreen @@ -372,11 +377,6 @@ - Cross hair cursor - win.crosshair - - - Blank Fill win.blankfill 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 @@ Save selected - win.save_selected + win.save.selected Print selected - win.print_selected + win.print.selected @@ -148,20 +148,43 @@ Options - - Show toolbar - win.toolbar - +
- - Show menu - win.menubar - + + Select by rectangles + win.rectselect + - - Full screen - win.fullscreen - + + Paste with left margin + win.marginedpaste + + + + Blank Fill + win.blankfill + + +
+ +
+ + + Show toolbar + win.toolbar + + + + Show menu + win.menubar + + + + Full screen + win.fullscreen + + +
@@ -256,6 +279,16 @@ + Save screen + win.save.screen + + + + Print screen + win.print.screen + + + Send/Receive files win.file.transfer @@ -264,20 +297,43 @@ Options - - Show toolbar - win.toolbar - +
- - Show menu - win.menubar - + + Select by rectangles + win.rectselect + - - Full screen - win.fullscreen - + + Paste with left margin + win.marginedpaste + + + + Blank Fill + win.blankfill + + +
+ +
+ + + Show toolbar + win.toolbar + + + + Show menu + win.menubar + + + + Full screen + win.fullscreen + + +
-- libgit2 0.21.2