merge upstream (manual fix)

src/Lib/client.cpp

@@ -28,7 +28,6 @@
 #include "settings.h"
 #include "lablib.h"
 
-
 extern std::unique_ptr< lc::Settings > settings;
 extern std::unique_ptr< lc::Lablib > lablib;
 
@@ -330,11 +329,6 @@ void lc::Client::StartClientBrowser( const QString * const argURL, const bool *
                   << "--noerrdialogs --kiosk"
                   << "--app='" + processedArgUrl + "'"
                   << "> /dev/null 2>&1 &disown";
-
-        // Add fullscreen toggle if checked
-        //if (*argFullscreen == true){
-        //   arguments << "&& sleep 3 && DISPLAY=:0.0 xdotool key --clearmodifiers F11";
-        //}
     }
 
     // Start the process

src/mainwindow.cpp

@@ -585,12 +585,11 @@ void lc::MainWindow::on_PBstartBrowser_clicked()
 {
     QString argURL = ui->LEURL->text();
     bool argFullscreen = ui->CBFullscreen->checkState();
-    QString argBrowser = ui->CB_BrowserSelection->currentText();
     QModelIndexList activated_items = ui->TVClients->selectionModel()->selectedIndexes();
     for ( QModelIndexList::ConstIterator it = activated_items.cbegin(); it != activated_items.cend(); ++it ) {
         if ( ( *it ).data( Qt::DisplayRole ).type() != 0 ) {
             Client *client = static_cast< Client* >( ( *it ).data( Qt::UserRole ).value< void * >() );
-            client->StartClientBrowser( &argURL, &argFullscreen, &argBrowser );
+            client->StartClientBrowser( &argURL, &argFullscreen );
         }
     }
 }

src/mainwindow.ui

@@ -7,7 +7,7 @@
     <x>0</x>
     <y>0</y>
     <width>730</width>
-    <height>903</height>
+    <height>900</height>
    </rect>
   </property>
   <property name="sizePolicy">
@@ -252,6 +252,10 @@
                <property name="toolTip">
                 <string>Shows the desktop of the selected clients.</string>
                </property>
+              </widget>
+             </item>
+             <item>
+              <widget class="QLabel" name="L_VNC">
                <property name="text">
                 <string>View desktop (view only)</string>
                </property>