tdf#100826: use console for -h and --version also on Windows

This removes the dialog used to show version information and
command line help on Windows. Now, selecting and scrolling becomes
possible, code is simplified and unified under all platforms.

Change-Id: Ia749bbb62d697eff655b3a646859c1986a023ec0
Reviewed-on: https://gerrit.libreoffice.org/31059Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Mike Kaganski <mike.kaganski@collabora.com>

desktop/UIConfig_deployment.mk

@@ -10,7 +10,6 @@
 $(eval $(call gb_UIConfig_UIConfig,desktop))
 
 $(eval $(call gb_UIConfig_add_uifiles,desktop,\
-    desktop/uiconfig/ui/cmdlinehelp \
     desktop/uiconfig/ui/dependenciesdialog \
     desktop/uiconfig/ui/extensionmanager \
     desktop/uiconfig/ui/installforalldialog \

desktop/qa/unit/data/desktop-dialogs-test.txt

@@ -35,7 +35,6 @@
 # test case since they need some document and model data to work
 # desktop/ui/extensionmanager.ui
 
-desktop/ui/cmdlinehelp.ui
 desktop/ui/dependenciesdialog.ui
 desktop/ui/updaterequireddialog.ui
 desktop/ui/showlicensedialog.ui

desktop/source/app/cmdlinehelp.hxx

@@ -20,31 +20,12 @@
 #ifndef INCLUDED_DESKTOP_SOURCE_APP_CMDLINEHELP_HXX
 #define INCLUDED_DESKTOP_SOURCE_APP_CMDLINEHELP_HXX
 
-#include <vcl/dialog.hxx>
-#include <vcl/fixed.hxx>
-#include <vcl/button.hxx>
+#include <rtl/ustring.hxx>
 
 namespace desktop
 {
     void displayCmdlineHelp( OUString const & unknown );
     void displayVersion();
-#ifndef UNX
-    class CmdlineHelpDialog : public ModalDialog
-    {
-    public:
-        CmdlineHelpDialog();
-
-        ~CmdlineHelpDialog() override;
-
-        VclPtr<FixedText>   m_pftHead;
-        VclPtr<FixedText>   m_pftLeft;
-        VclPtr<FixedText>   m_pftRight;
-        VclPtr<FixedText>   m_pftBottom;
-
-    private:
-        void dispose() override;
-    };
-#endif
 }
 
 #endif

desktop/uiconfig/ui/cmdlinehelp.ui

-<?xml version="1.0" encoding="UTF-8"?>
-<interface>
-  <!-- interface-requires gtk+ 3.0 -->
-  <object class="GtkDialog" id="CmdLineHelp">
-    <property name="can_focus">False</property>
-    <property name="border_width">6</property>
-    <property name="title" translatable="yes">Help Message</property>
-    <property name="destroy_with_parent">True</property>
-    <property name="type_hint">dialog</property>
-    <child internal-child="vbox">
-      <object class="GtkBox" id="dialog-vbox1">
-        <property name="can_focus">False</property>
-        <property name="orientation">vertical</property>
-        <property name="spacing">2</property>
-        <child>
-          <object class="GtkBox" id="box1">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
-            <property name="orientation">vertical</property>
-            <child>
-              <object class="GtkLabel" id="header">
-                <property name="visible">True</property>
-                <property name="can_focus">False</property>
-                <property name="halign">start</property>
-                <property name="xalign">0</property>
-                <property name="xpad">10</property>
-                <property name="label" translatable="no">HEADER</property>
-              </object>
-              <packing>
-                <property name="expand">False</property>
-                <property name="fill">True</property>
-                <property name="position">0</property>
-              </packing>
-            </child>
-            <child>
-              <object class="GtkGrid" id="grid1">
-                <property name="visible">True</property>
-                <property name="can_focus">False</property>
-                <property name="halign">start</property>
-                <child>
-                  <object class="GtkLabel" id="left">
-                    <property name="visible">True</property>
-                    <property name="can_focus">False</property>
-                    <property name="halign">start</property>
-                    <property name="xalign">0</property>
-                    <property name="xpad">10</property>
-                    <property name="label" translatable="no">LEFT</property>
-                  </object>
-                  <packing>
-                    <property name="left_attach">0</property>
-                    <property name="top_attach">0</property>
-                    <property name="width">1</property>
-                    <property name="height">1</property>
-                  </packing>
-                </child>
-                <child>
-                  <object class="GtkLabel" id="right">
-                    <property name="visible">True</property>
-                    <property name="can_focus">False</property>
-                    <property name="halign">start</property>
-                    <property name="xalign">0</property>
-                    <property name="xpad">10</property>
-                    <property name="label" translatable="no">RIGHT</property>
-                  </object>
-                  <packing>
-                    <property name="left_attach">1</property>
-                    <property name="top_attach">0</property>
-                    <property name="width">1</property>
-                    <property name="height">1</property>
-                  </packing>
-                </child>
-              </object>
-              <packing>
-                <property name="expand">False</property>
-                <property name="fill">True</property>
-                <property name="position">1</property>
-              </packing>
-            </child>
-            <child>
-              <object class="GtkLabel" id="bottom">
-                <property name="visible">True</property>
-                <property name="can_focus">False</property>
-                <property name="halign">start</property>
-                <property name="xalign">0</property>
-                <property name="xpad">10</property>
-                <property name="label" translatable="no">BOTTOM</property>
-              </object>
-              <packing>
-                <property name="expand">False</property>
-                <property name="fill">True</property>
-                <property name="position">2</property>
-              </packing>
-            </child>
-          </object>
-          <packing>
-            <property name="expand">False</property>
-            <property name="fill">True</property>
-            <property name="position">0</property>
-          </packing>
-        </child>
-        <child internal-child="action_area">
-          <object class="GtkButtonBox" id="dialog-action_area1">
-            <property name="can_focus">False</property>
-            <property name="halign">center</property>
-            <property name="layout_style">center</property>
-            <child>
-              <object class="GtkButton" id="button1">
-                <property name="label">gtk-close</property>
-                <property name="visible">True</property>
-                <property name="can_focus">True</property>
-                <property name="can_default">True</property>
-                <property name="has_default">True</property>
-                <property name="receives_default">True</property>
-                <property name="halign">center</property>
-                <property name="use_stock">True</property>
-              </object>
-              <packing>
-                <property name="expand">False</property>
-                <property name="fill">True</property>
-                <property name="position">0</property>
-              </packing>
-            </child>
-          </object>
-          <packing>
-            <property name="expand">False</property>
-            <property name="fill">False</property>
-            <property name="pack_type">end</property>
-            <property name="position">1</property>
-          </packing>
-        </child>
-      </object>
-    </child>
-    <action-widgets>
-      <action-widget response="0">button1</action-widget>
-    </action-widgets>
-  </object>
-</interface>

l10ntools/source/gRun.sh

@@ -690,7 +690,7 @@ ${MYCMD} --base cui/uiconfig/ui --files aboutconfigdialog.ui aboutconfigvaluedia
 
 ${MYCMD} --base dbaccess/uiconfig/ui --files admindialog.ui advancedsettingsdialog.ui applycolpage.ui authentificationpage.ui autocharsetpage.ui backuppage.ui choosedatasourcedialog.ui collectionviewdialog.ui colwidthdialog.ui connectionpage.ui copytablepage.ui dbaseindexdialog.ui dbasepage.ui dbwizconnectionpage.ui dbwizmysqlintropage.ui dbwizmysqlnativepage.ui dbwizspreadsheetpage.ui dbwiztextpage.ui deleteallrowsdialog.ui designsavemodifieddialog.ui directsqldialog.ui emptypage.ui fielddialog.ui finalpagewizard.ui generalpagedialog.ui generalpagewizard.ui generalspecialjdbcdetailspage.ui generatedvaluespage.ui indexdesigndialog.ui jdbcconnectionpage.ui joindialog.ui ldapconnectionpage.ui ldappage.ui migratepage.ui mysqlnativepage.ui mysqlnativesettings.ui namematchingpage.ui odbcpage.ui parametersdialog.ui password.ui preparepage.ui queryfilterdialog.ui querypropertiesdialog.ui relationdialog.ui rowheightdialog.ui rtfcopytabledialog.ui savedialog.ui saveindexdialog.ui savemodifieddialog.ui sortdialog.ui specialjdbcconnectionpage.ui specialsettingspage.ui sqlexception.ui summarypage.ui tabledesignsavemodifieddialog.ui tablesfilterdialog.ui tablesfilterpage.ui tablesjoindialog.ui textconnectionsettings.ui textpage.ui typeselectpage.ui useradmindialog.ui useradminpage.ui userdetailspage.ui
 
-${MYCMD} --base desktop/uiconfig/ui --files cmdlinehelp.ui dependenciesdialog.ui extensionmanager.ui installforalldialog.ui licensedialog.ui showlicensedialog.ui updatedialog.ui updateinstalldialog.ui updaterequireddialog.ui
+${MYCMD} --base desktop/uiconfig/ui --files dependenciesdialog.ui extensionmanager.ui installforalldialog.ui licensedialog.ui showlicensedialog.ui updatedialog.ui updateinstalldialog.ui updaterequireddialog.ui
 
 ${MYCMD} --base extensions/uiconfig/sabpilot/ui --files contentfieldpage.ui contenttablepage.ui datasourcepage.ui defaultfieldselectionpage.ui fieldassignpage.ui fieldlinkpage.ui gridfieldsselectionpage.ui groupradioselectionpage.ui invokeadminpage.ui optiondbfieldpage.ui optionsfinalpage.ui optionvaluespage.ui selecttablepage.ui selecttypepage.ui tableselectionpage.ui