[no subject]

[Gavin D. Smith]

branch: old/qt-info
commit c617f44ac6db9e74dc688b63b93b6b40251e6a4b
Author: Gavin Smith <gavinsmith0123@gmail.com>
AuthorDate: Fri Apr 19 00:26:49 2019 +0100

    dont hide combo input on activated signal and make it uneditable
---
 js/docbrowser/infopath.c     | 8 +-------
 js/docbrowser/mainwindow.cpp | 6 ++----
 js/docbrowser/mainwindow.ui  | 2 +-
 3 files changed, 4 insertions(+), 12 deletions(-)

diff --git a/js/docbrowser/infopath.c b/js/docbrowser/infopath.c
index 9d4415f3b9..ccc75339ab 100644
--- a/js/docbrowser/infopath.c
+++ b/js/docbrowser/infopath.c
@@ -13,16 +13,11 @@ long datadir_len;
 char *
 locate_manual (const char *manual)
 {
-  fprintf (stderr, "In C now, looking for %s\n", manual);
-
   if (!datadir)
     {
       datadir = getenv ("QTINFO_DATADIR");
       if (!datadir)
-        {
-          exit (1); /* probably wrong for C++ */
-          return 0;
-        }
+        return 0;
       datadir_len = strlen (datadir);
     }
 
@@ -47,7 +42,6 @@ locate_manual (const char *manual)
     }
   closedir (d);
 
-  fprintf (stderr, "success so far\n");
   free (s);
   s = malloc (datadir_len + strlen ("/test/")
                     + strlen (manual) + strlen ("/index.html") + 1);
diff --git a/js/docbrowser/mainwindow.cpp b/js/docbrowser/mainwindow.cpp
index b8263feb5a..1a5bdad13e 100644
--- a/js/docbrowser/mainwindow.cpp
+++ b/js/docbrowser/mainwindow.cpp
@@ -200,11 +200,9 @@ void MainWindow::on_loadButton_clicked()
 }
 
 
-void MainWindow::on_promptCombo_activated(const QString &arg1)
+void MainWindow::on_promptCombo_activated(const QString &str)
 {
-  core->activate_input(arg1);
-  hide_prompt();
-  ui->webEngineView->setFocus();
+  core->activate_input(str);
 }
 
 /* Hide the text prompt.
diff --git a/js/docbrowser/mainwindow.ui b/js/docbrowser/mainwindow.ui
index 7118299be5..1d1c4705fb 100644
--- a/js/docbrowser/mainwindow.ui
+++ b/js/docbrowser/mainwindow.ui
@@ -39,7 +39,7 @@
          </sizepolicy>
         </property>
         <property name="editable">
-         <bool>true</bool>
+         <bool>false</bool>
         </property>
        </widget>
       </item>