desktop/source/app/cmdlinehelp.cxx | 66 ++++++++++++------------- desktop/source/app/desktop.src | 97 ++++++++++++++++++------------------- 2 files changed, 81 insertions(+), 82 deletions(-)
New commits: commit 16332a508b683570f04505fbb8b409e2fd72d0a8 Author: Matthias Seidel <[email protected]> AuthorDate: Wed Dec 26 13:29:49 2018 +0000 Commit: Matthias Seidel <[email protected]> CommitDate: Wed Dec 26 13:29:49 2018 +0000 Further corrections to commandline help, resized dialog window (for Windows, etc.) diff --git a/desktop/source/app/cmdlinehelp.cxx b/desktop/source/app/cmdlinehelp.cxx index fe8de8355225..773ccd574fa9 100644 --- a/desktop/source/app/cmdlinehelp.cxx +++ b/desktop/source/app/cmdlinehelp.cxx @@ -77,50 +77,50 @@ namespace desktop "-o \n"\ "-n \n"; const char *aCmdLineHelp_right = - "keep startup bitmap minimized.\n"\ - "no startup screen, no default document and no UI.\n"\ - "suppress restart/restore after fatal errors.\n"\ - "starts the quickstart service (only available on Windows and OS/2)\n"\ - "don't show startup screen.\n"\ - "don't check for remote instances using the installation\n"\ - "don't start with an empty document\n"\ - "like invisible but no user interaction at all.\n"\ - "enable further optimization for document conversion, includes headless mode.\n"\ - "show this message and exit.\n"\ - "create new text document.\n"\ - "create new spreadsheet document.\n"\ - "create new drawing.\n"\ - "create new presentation.\n"\ - "create new database.\n"\ - "create new formula.\n"\ - "create new global document.\n"\ - "create new HTML document.\n"\ - "open documents regardless whether they are templates or not.\n"\ - "always open documents as new files (use as template).\n"; + "Keep startup screen minimized.\n"\ + "No startup screen, no default document and no UI.\n"\ + "Suppress restart/restore after fatal errors.\n"\ + "Start the quickstart service (only available on Windows and OS/2).\n"\ + "Don't show startup screen.\n"\ + "Don't check for remote instances using the installation.\n"\ + "Don't start with an empty document.\n"\ + "Like invisible but no user interaction at all.\n"\ + "Enable further optimization for document conversion, incl. headless mode.\n"\ + "Show this message.\n"\ + "Create new text document.\n"\ + "Create new spreadsheet document.\n"\ + "Create new drawing.\n"\ + "Create new presentation.\n"\ + "Create new database.\n"\ + "Create new formula.\n"\ + "Create new global document.\n"\ + "Create new HTML document.\n"\ + "Open documents regardless whether they are templates or not.\n"\ + "Always open documents as new files (use as template).\n"; const char *aCmdLineHelp_bottom = "-display <display>\n"\ " Specify X-Display to use in Unix/X11 versions.\n" "-p <documents...>\n"\ - " print the specified documents on the default printer.\n"\ + " Print the specified documents on the default printer.\n"\ "-pt <printer> <documents...>\n"\ - " print the specified documents on the specified printer.\n"\ + " Print the specified documents on the specified printer.\n"\ "-view <documents...>\n"\ - " open the specified documents in viewer-(readonly-)mode.\n"\ + " Open the specified documents in viewer-(readonly-)mode.\n"\ "-show <presentation>\n"\ - " open the specified presentation and start it immediately\n"\ + " Open the specified presentation and start it immediately.\n"\ "-accept=<accept-string>\n"\ " Specify an UNO connect-string to create an UNO acceptor through which\n"\ - " other programs can connect to access the API\n"\ + " other programs can connect to access the API.\n"\ "-unaccept=<accept-string>\n"\ " Close an acceptor that was created with -accept=<accept-string>\n"\ - " Use -unnaccept=all to close all open acceptors\n"\ + " Use -unnaccept=all to close all open acceptors.\n"\ "Remaining arguments will be treated as filenames or URLs of documents to open.\n"; void ReplaceStringHookProc( UniString& rStr ); void displayCmdlineHelp() { - // if you put variables in other chunks don't forget to call the replace routines + // If you put variables in other chunks don't forget to call the replace routines // for those chunks... String aHelpMessage_head(aCmdLineHelp_head, RTL_TEXTENCODING_ASCII_US); String aHelpMessage_left(aCmdLineHelp_left, RTL_TEXTENCODING_ASCII_US); @@ -132,10 +132,9 @@ namespace desktop aHelpMessage_head.SearchAndReplaceAscii( "%BUILDID", aVerId ); aHelpMessage_head.SearchAndReplaceAscii( "%CMDNAME", String( "soffice", RTL_TEXTENCODING_ASCII_US) ); #ifdef UNX - // on unix use console for output - fprintf(stderr, "%s\n", ByteString(aHelpMessage_head, - RTL_TEXTENCODING_ASCII_US).GetBuffer()); - // merge left and right column + // On Unix use console for output + fprintf(stderr, "%s\n", ByteString(aHelpMessage_head, RTL_TEXTENCODING_ASCII_US).GetBuffer()); + // Merge left and right column int n = aHelpMessage_left.GetTokenCount ('\n'); ByteString bsLeft(aHelpMessage_left, RTL_TEXTENCODING_ASCII_US); ByteString bsRight(aHelpMessage_right, RTL_TEXTENCODING_ASCII_US); @@ -144,10 +143,9 @@ namespace desktop fprintf(stderr, "%s", bsLeft.GetToken(i, '\n').GetBuffer()); fprintf(stderr, "%s\n", bsRight.GetToken(i, '\n').GetBuffer()); } - fprintf(stderr, "%s", ByteString(aHelpMessage_bottom, - RTL_TEXTENCODING_ASCII_US).GetBuffer()); + fprintf(stderr, "%s", ByteString(aHelpMessage_bottom, RTL_TEXTENCODING_ASCII_US).GetBuffer()); #else - // rest gets a dialog box + // All other get a dialog box CmdlineHelpDialog aDlg; aDlg.m_ftHead.SetText(aHelpMessage_head); aDlg.m_ftLeft.SetText(aHelpMessage_left); diff --git a/desktop/source/app/desktop.src b/desktop/source/app/desktop.src index 338fbae2b359..e2ccdafc52a8 100644 --- a/desktop/source/app/desktop.src +++ b/desktop/source/app/desktop.src @@ -41,92 +41,92 @@ WarningBox STR_RECOVER_PREPARED String STR_BOOTSTRAP_ERR_CANNOT_START { - Text [ en-US ] = "The application cannot be started. "; + Text [ en-US ] = "The application cannot be started. " ; }; String STR_BOOTSTRAP_ERR_DIR_MISSING { - Text [ en-US ] = "The configuration directory \"$1\" could not be found."; + Text [ en-US ] = "The configuration directory \"$1\" could not be found." ; }; String STR_BOOTSTRAP_ERR_PATH_INVALID { - Text [ en-US ] = "The installation path is invalid."; + Text [ en-US ] = "The installation path is invalid." ; }; String STR_BOOTSTRAP_ERR_NO_PATH { - Text [ en-US ] = "The installation path is not available."; + Text [ en-US ] = "The installation path is not available." ; }; String STR_BOOTSTRAP_ERR_INTERNAL { - Text [ en-US ] = "An internal error occurred."; + Text [ en-US ] = "An internal error occurred." ; }; String STR_BOOTSTRAP_ERR_FILE_CORRUPT { - Text [ en-US ] = "The configuration file \"$1\" is corrupt."; + Text [ en-US ] = "The configuration file \"$1\" is corrupt." ; }; String STR_BOOTSTRAP_ERR_FILE_MISSING { - Text [ en-US ] = "The configuration file \"$1\" was not found."; + Text [ en-US ] = "The configuration file \"$1\" was not found." ; }; String STR_BOOTSTRAP_ERR_NO_SUPPORT { - Text [ en-US ] = "The configuration file \"$1\" does not support the current version."; + Text [ en-US ] = "The configuration file \"$1\" does not support the current version." ; }; String STR_BOOTSTRAP_ERR_LANGUAGE_MISSING { - Text [ en-US ] = "The user interface language cannot be determined."; + Text [ en-US ] = "The user interface language cannot be determined." ; }; String STR_BOOTSTRAP_ERR_NO_SERVICE { - Text [ en-US ] = "The component manager is not available."; + Text [ en-US ] = "The component manager is not available." ; }; String STR_BOOTSTRAP_ERR_NO_CFG_SERVICE { - Text [ en-US ] = "The configuration service is not available."; + Text [ en-US ] = "The configuration service is not available." ; }; String STR_BOOTSTRAP_ERR_MULTISESSION { - Text [ en-US ] = "You have another instance running in a different terminal session. Close that instance and then try again."; + Text [ en-US ] = "You have another instance running in a different terminal session. Close that instance and then try again." ; }; String STR_ASK_START_SETUP_MANUALLY { - Text [ en-US ] = "Start the setup application to repair the installation from the CD or the folder containing the installation packages."; + Text [ en-US ] = "Start the setup application to repair the installation from the CD or the folder containing the installation packages." ; }; String STR_CONFIG_ERR_SETTINGS_INCOMPLETE { - Text [ en-US ] = "The startup settings for accessing the central configuration are incomplete. "; + Text [ en-US ] = "The startup settings for accessing the central configuration are incomplete. " ; }; String STR_CONFIG_ERR_CANNOT_CONNECT { - Text [ en-US ] = "A connection to the central configuration could not be established. "; + Text [ en-US ] = "A connection to the central configuration could not be established. " ; }; String STR_CONFIG_ERR_RIGHTS_MISSING { - Text [ en-US ] = "You cannot access the central configuration because of missing access rights. "; + Text [ en-US ] = "You cannot access the central configuration because of missing access rights. " ; }; String STR_CONFIG_ERR_ACCESS_GENERAL { - Text [ en-US ] = "A general error occurred while accessing your central configuration. "; + Text [ en-US ] = "A general error occurred while accessing your central configuration. " ; }; String STR_CONFIG_ERR_NO_WRITE_ACCESS { - Text [ en-US ] = "The changes to your personal settings cannot be stored centrally because of missing access rights. "; + Text [ en-US ] = "The changes to your personal settings cannot be stored centrally because of missing access rights. " ; }; String STR_BOOTSTRAP_ERR_CFG_DATAACCESS @@ -136,65 +136,65 @@ String STR_BOOTSTRAP_ERR_CFG_DATAACCESS String STR_INTERNAL_ERRMSG { - Text [ en-US ] = "The following internal error has occurred: " ; + Text [ en-US ] = "The following internal error has occurred : " ; }; QueryBox QBX_USERDATALOCKED { Buttons = WB_YES_NO ; DefButton = WB_DEF_NO ; - Message [ en-US ] = "Either another instance of %PRODUCTNAME is accessing your personal settings or your personal settings are locked.\nSimultaneous access can lead to inconsistencies in your personal settings. Before continuing, you should make sure user '$u' closes %PRODUCTNAME on host '$h'.\n\nDo you really want to continue?"; + Message [ en-US ] = "Either another instance of %PRODUCTNAME is accessing your personal settings or your personal settings are locked.\nSimultaneous access can lead to inconsistencies in your personal settings. Before continuing, you should make sure user '$u' closes %PRODUCTNAME on host '$h'.\n\nDo you really want to continue?" ; }; String STR_TITLE_USERDATALOCKED { - Text [ en-US ] = "%PRODUCTNAME %PRODUCTVERSION"; + Text [ en-US ] = "%PRODUCTNAME %PRODUCTVERSION" ; }; InfoBox INFOBOX_CMDLINEHELP { Buttons = WB_OK ; DefButton = WB_DEF_OK ; - Message = ""; + Message = "" ; }; ModalDialog DLG_CMDLINEHELP { - HelpID = "desktop:ModalDialog:DLG_CMDLINEHELP"; - Text = "Help Message..."; - Size = MAP_APPFONT(250, 365); - Border = True; - SVLook = True; - Moveable = True; + HelpID = "desktop:ModalDialog:DLG_CMDLINEHELP" ; + Text = "%PRODUCTNAME Commandline Help" ; + Size = MAP_APPFONT ( 275, 380 ) ; + Border = True ; + SVLook = True ; + Moveable = True ; FixedText TXT_DLG_CMDLINEHELP_HEADER { - Size = MAP_APPFONT(240, 50); - Pos = MAP_APPFONT(5, 5); - Text = "HEADER"; + Size = MAP_APPFONT ( 265, 50 ) ; + Pos = MAP_APPFONT ( 5, 5 ) ; + Text = "HEADER" ; }; FixedText TXT_DLG_CMDLINEHELP_LEFT { - Size = MAP_APPFONT(50, 150); - Pos = MAP_APPFONT(5, 50); - Text = "LEFT"; + Size = MAP_APPFONT ( 50, 160 ) ; + Pos = MAP_APPFONT ( 5, 50 ) ; + Text = "LEFT" ; }; FixedText TXT_DLG_CMDLINEHELP_RIGHT { - Size = MAP_APPFONT(190, 150); - Pos = MAP_APPFONT(60, 50); - Text = "RIGHT"; + Size = MAP_APPFONT ( 215, 160 ) ; + Pos = MAP_APPFONT ( 60, 50 ) ; + Text = "RIGHT" ; }; FixedText TXT_DLG_CMDLINEHELP_BOTTOM { - Size = MAP_APPFONT(240, 145); - Pos = MAP_APPFONT(5, 200); - Text = "BOTTOM"; + Size = MAP_APPFONT ( 265, 145 ) ; + Pos = MAP_APPFONT ( 5, 215 ) ; + Text = "BOTTOM" ; }; OKButton BTN_DLG_CMDLINEHELP_OK { - Size = MAP_APPFONT ( 50 , 14 ) ; - Pos = MAP_APPFONT(95, 345); + Size = MAP_APPFONT ( 50, 14 ) ; + Pos = MAP_APPFONT ( 112, 360 ) ; TabStop = TRUE ; DefButton = TRUE ; }; @@ -204,33 +204,34 @@ ErrorBox EBX_ERR_PRINTDISABLED { Buttons = WB_OK ; DefButton = WB_DEF_OK ; - Message [ en-US ] = "Printing is disabled. No documents can be printed."; + Message [ en-US ] = "Printing is disabled. No documents can be printed." ; }; InfoBox INFOBOX_EXPIRED { Buttons = WB_OK ; DefButton = WB_DEF_OK ; - Message [ en-US ] = "This Evaluation Version has expired. To find out more about %PRODUCTNAME,\nvisit http://www.openoffice.org";; + Message [ en-US ] = "This Evaluation Version has expired. To find out more about %PRODUCTNAME,\nvisit https://www.openoffice.org"; ; }; String STR_TITLE_EXPIRED { - Text [ en-US ] = "%PRODUCTNAME %PRODUCTVERSION"; + Text [ en-US ] = "%PRODUCTNAME %PRODUCTVERSION" ; }; String STR_BOOTSTRAP_ERR_NO_PATHSET_SERVICE { - Text [ en-US ] = "The path manager is not available.\n"; + Text [ en-US ] = "The path manager is not available.\n" ; }; String STR_BOOSTRAP_ERR_NOTENOUGHDISKSPACE { - Text [ en-US ] = "%PRODUCTNAME user installation could not be completed due to insufficient free disk space. Please free more disc space at the following location and restart %PRODUCTNAME:\n\n"; + Text [ en-US ] = "%PRODUCTNAME user installation could not be completed due to insufficient free disk space. Please free more disc space at the following location and restart %PRODUCTNAME:\n\n" ; }; String STR_BOOSTRAP_ERR_NOACCESSRIGHTS { - Text [ en-US ] = "%PRODUCTNAME user installation could not be processed due to missing access rights. Please make sure that you have sufficient access rights for the following location and restart %PRODUCTNAME:\n\n"; + Text [ en-US ] = "%PRODUCTNAME user installation could not be processed due to missing access rights. Please make sure that you have sufficient access rights for the following location and restart %PRODUCTNAME:\n\n" ; }; +// ********************************************************************** EOF _______________________________________________ Libreoffice-commits mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
