diff --git a/src/objects/application/application.c b/src/objects/application/application.c index bd4de4f..ebe36ab 100644 --- a/src/objects/application/application.c +++ b/src/objects/application/application.c @@ -264,8 +264,7 @@ if(gtk_application_prefers_app_menu(GTK_APPLICATION(application))) gtk_application_set_app_menu(GTK_APPLICATION (application), G_MENU_MODEL(gtk_builder_get_object (builder, "app-menu"))); - if(pw3270_application_get_ui_style(application) == PW3270_UI_STYLE_CLASSICAL) - gtk_application_set_menubar(GTK_APPLICATION (application), G_MENU_MODEL(gtk_builder_get_object (builder, "menubar"))); + gtk_application_set_menubar(GTK_APPLICATION (application), G_MENU_MODEL(gtk_builder_get_object (builder, "menubar"))); pw3270_load_placeholders(builder); diff --git a/ui/application.xml b/ui/application.xml index e0fcc7f..6695f3b 100644 --- a/ui/application.xml +++ b/ui/application.xml @@ -28,419 +28,424 @@ --> - - - - - About PW3270 - app.about - + + - - New Window - app.new.window - + + About PW3270 + app.about + - + + New Window + app.new.window + - _View + - - Trace - win.trace - + Options - - Toolbar - win.toolbar - + + Show toolbar + win.toolbar + - - Menu - win.menubar - + + Show menu + win.menubar + - + + Show trace + win.trace + - - Quit - app.quit - - - + - + + Preferences + win.preferences + - + + Quit + app.quit + - _File + -
+ - - Save screen - win.save_screen - + - - Save selected - win.save_selected - + _File - - Save copy - win.save_copy - +
-
+ + Save screen + win.save_screen + -
+ + Save selected + win.save_selected + - - Print - win.print - + + Save copy + win.save_copy + - - Print selected - win.print_selected - +
+ +
+ + + Print + win.print + + + + Print selected + win.print_selected + + + + Print copy + win.print_copy + + +
+ +
+ + + Send/Receive files + win.file.transfer + - - Print copy - win.print_copy - + + Quit application + app.quit +
-
+ + + + + _Edit + +
+ + + Copy + win.copy + auto + + + + Copy as text + win.copy + text + + + + Copy as table + win.copy + table + + + + Append to copy + win.copy + append + + + + Cut + win.cut + auto + + + + Paste from clipboard + win.paste + clipboard:// + + + + Paste next + win.paste + next:// + + + + Paste from text file + win.paste + file:// + - - Send/Receive files - win.file.transfer - - - - Quit application - app.quit - - -
+
+ +
+ + + Select all + win.select-all + - - - + + Select Field + win.select-field + - _Edit - -
- - - Copy - win.copy - auto - + + Unselect + win.unselect + - - Copy as text - win.copy - text - + + Reselect + win.reselect + + +
- - Copy as table - win.copy - table - +
- - Append to copy - win.copy - append - + + Clear + win.clear + - - Cut - win.cut - auto - + + Erase input + win.erase_input + - - Paste from clipboard - win.paste - clipboard:// - + + Delete Field + win.delete_field + + + + Erase to end of field + win.erase_eof + + + + Erase to end of line + win.erase_eol + + +
- - Paste next - win.paste - next:// - + - - Paste from text file - win.paste - file:// - + -
+ _View -
+ + Trace + win.trace + - - Select all - win.select-all - + + Toolbar + win.toolbar + - - Select Field - win.select-field - + + Menu + win.menubar + - - Unselect - win.unselect - + + Field attributes + win.fieldattr + - - Reselect - win.reselect - + -
+ -
+ _Network + + + Host properties + win.set.host + + + + _Connect + win.connect + + + + _Disconnect + win.disconnect + + + + + + + Settings + + + Colors + win.set.colors + + + + + Screen size + + + Model 2 - 80x24 + win.model-number + 2 + + + Model 3 - 80x32 + win.model-number + 3 + + + Model 4 - 80x43 + win.model-number + 4 + + + Model 5 - 132x27 + win.model-number + 5 + + + + + + Terminal font + + + + + Options + + + Connect on startup + win.autoconnect + + + + Blinking Cursor + win.cursorblink + + + + Monocase + win.monocase + + + + Track Cursor + win.cursorpos + + + + Full Screen + win.fullscreen + + + + Resize on alternate screen + win.altscreen + + + + Paste with left margin + win.marginedpaste + + + + Cross hair cursor + win.crosshair + + + + Blank Fill + win.blankfill + + + + Select by rectangles + win.rectselect + + + + Auto-Reconnect + win.autoreconnect + + + + Bold + win.bold + + + + Show Underline + win.underline + + + + Keep selected + win.keepselected + + + + Smart paste + win.smartpaste + + + + Alert sound + win.beep + + + + Use +/- for field navigation + win.kpalternative + + + + Network keep alive + win.keepalive + - - Clear - win.clear - - - - Erase input - win.erase_input - - - - Delete Field - win.delete_field - - - - Erase to end of field - win.erase_eof - - - - Erase to end of line - win.erase_eol - - -
- - - - - - _View - - - Trace - win.trace - - - - Toolbar - win.toolbar - - - - Menu - win.menubar - - - - Field attributes - win.fieldattr - - - - - - - _Network - - - Configure host - win.set.host - - - - _Connect - win.connect - - - - _Disconnect - win.disconnect - - - - - - - Settings - - - Colors - win.set.colors - - - - - Screen size - - - Model 2 - 80x24 - win.model-number - 2 - - - Model 3 - 80x32 - win.model-number - 3 - - - Model 4 - 80x43 - win.model-number - 4 - - - Model 5 - 132x27 - win.model-number - 5 - - - - - - Terminal font - - - - - Options - - - Connect on startup - win.autoconnect - - - - Blinking Cursor - win.cursorblink - - - - Monocase - win.monocase - - - - Track Cursor - win.cursorpos - - - - Full Screen - win.fullscreen - - - - Resize on alternate screen - win.altscreen - - - - Paste with left margin - win.marginedpaste - - - - Cross hair cursor - win.crosshair - - - - Blank Fill - win.blankfill - - - - Select by rectangles - win.rectselect - - - - Auto-Reconnect - win.autoreconnect - - - - Bold - win.bold - - - - Show Underline - win.underline - - - - Keep selected - win.keepselected - - - - Smart paste - win.smartpaste - - - - Alert sound - win.beep - - - - Use +/- for field navigation - win.kpalternative - - - - Network keep alive - win.keepalive - + + Dynamic font spacing + win.dynamic-font-spacing + - - Dynamic font spacing - win.dynamic-font-spacing - + + + + + + + Help + + + About PW3270 + app.about + + + - - - - - - - Help - - - About PW3270 - app.about - - - + - -
diff --git a/ui/window.xml b/ui/window.xml index be96846..6bd6d2c 100644 --- a/ui/window.xml +++ b/ui/window.xml @@ -28,324 +28,304 @@ --> - - -
- - - New - - Tab - app.new.tab - - - Application Window - app.new.window - - - - - Open - - File - app.open - - - New tab - app.new.tab - - - New window - app.new.window - - - -
- -
- - Preferences - win.preferences - -
- - - - - - - _Edit - -
- - - Copy - win.copy - auto - - - - Copy as text - win.copy - text - - - - Copy as table - win.copy - table - - - - Append to copy - win.copy - append - - - - Cut - win.cut - auto - - -
-
- - - Save selected - win.save_selected - - - - Print selected - win.print_selected - - - - Unselect - win.unselect - - -
- -
- - - Clear - win.clear - - - - Erase input - win.erase_input - - - - Delete Field - win.delete_field - - - - Erase to end of field - win.erase_eof - - - - Erase to end of line - win.erase_eol - -
+ + +
+ + + New tab + app.new.tab + + + New Window + app.new.window + +
- + + Preferences + win.preferences + - + - Options + + + + _Edit - - Show toolbar - win.toolbar - +
+ + + Copy + win.copy + auto + - - Show menu - win.menubar - + + Copy as text + win.copy + text + + + + Copy as table + win.copy + table + - - Full screen - win.fullscreen - + + Append to copy + win.copy + append + - + + Cut + win.cut + auto + - - Disconnect - win.disconnect - +
- - Close window - win.close - +
-
+ + Save selected + win.save_selected + - + + Print selected + win.print_selected + - + + Unselect + win.unselect + - _Edit + -
+
- - Paste from clipboard - win.paste - clipboard:// - + + Clear + win.clear + - - Paste next - win.paste - next:// - + + Erase input + win.erase_input + - - Paste from text file - win.paste - file:// - + + Delete Field + win.delete_field + -
+ + Erase to end of field + win.erase_eof + -
+ + Erase to end of line + win.erase_eol + - - Select all - win.select-all - +
- - Select Field - win.select-field - + - - Reselect - win.reselect - + -
+ Options -
+ + Show toolbar + win.toolbar + - - Clear - win.clear - + + Show menu + win.menubar + - - Erase input - win.erase_input - + + Full screen + win.fullscreen + - - Delete Field - win.delete_field - + - - Erase to end of field - win.erase_eof - + + Disconnect + win.disconnect + - - Erase to end of line - win.erase_eol - + + Close window + win.close + -
+ - + - - Send/Receive files - win.file.transfer - + - + _Edit - Options +
- - Show toolbar - win.toolbar - + + Paste from clipboard + win.paste + clipboard:// + - - Show menu - win.menubar - + + Paste next + win.paste + next:// + - - Full screen - win.fullscreen - + + Paste from text file + win.paste + file:// + - +
- - Disconnect - win.disconnect - +
- - Close window - win.close - + + Select all + win.select-all + -
+ + Select Field + win.select-field + - + + Reselect + win.reselect + - - _Connect - win.connect - + - - Configure host - win.set.host - +
- + + Clear + win.clear + - Options + + Erase input + win.erase_input + - - Show toolbar - win.toolbar - + + Delete Field + win.delete_field + - - Show menu - win.menubar - + + Erase to end of field + win.erase_eof + - - Full screen - win.fullscreen - + + Erase to end of line + win.erase_eol + - +
- - Close window - win.close - + - + + Send/Receive files + win.file.transfer + + + + + Options + + + Show toolbar + win.toolbar + + + + Show menu + win.menubar + + + + Full screen + win.fullscreen + + + + + + Disconnect + win.disconnect + + + + Close window + win.close + + + + + + + + _Connect + win.connect + + + + Host properties + win.set.host + + + + + Options + + + Show toolbar + win.toolbar + + + + Show menu + win.menubar + + + + Full screen + win.fullscreen + + + + + + Close window + win.close + + + -- libgit2 0.21.2