Changed file permissions for group writing, added size parameter for local zleaf. renamed Beam file to Beam folder, disabled self shutdown, fixed webcam dropdown (added Choose webcam entry), added autostart z-leaf on client with session button, added Restart crashed session button

data/Labcontrol.conf

@@ -29,6 +29,7 @@ labcontrol_installation_directory=/usr/local/share/labcontrol
 latex_command=/usr/bin/latex
 # The default name for locally started zLeaves
 local_zLeaf_name=local
+local_zLeaf_size=1280x1024
 lpr_command=/usr/bin/lpr
 netstat_command=/bin/netstat
 network_broadcast_address=192.168.1.255
@@ -60,3 +61,5 @@ wmctrl_command=/usr/bin/wmctrl
 xset_command=/usr/bin/xset
 # The folder were all zTree versions are installed (in subfolders matching the scheme zTree_X.Y.Z)
 ztree_installation_directory=/opt/z-Leaves
+# Script to be called after session crash
+restart_crashed_session_script=/home/scripts/start_zTree_after_crash.sh

src/Lib/settings.cpp

@@ -47,6 +47,9 @@ lc::Settings::Settings( const QSettings &argSettings, QObject *argParent ) :
                                  "Labcontrol will missbehave with high propability.",
                                  argSettings, true ) },
     localUserName{ GetLocalUserName() },
+    localzLeafSize{ ReadSettingsItem( "local_zLeaf_size",
+                               "Resolution of local zLeaf window",
+                               argSettings, false ) },
     lprCmd{ ReadSettingsItem( "lpr_command",
                               "Receipts printing will not work.",
                               argSettings, true ) },
@@ -118,6 +121,9 @@ lc::Settings::Settings( const QSettings &argSettings, QObject *argParent ) :
     zTreeInstDir{ ReadSettingsItem( "ztree_installation_directory",
                                     "zTree will not be available.",
                                     argSettings, true ) },
+    restartCrashedSessionScript{ ReadSettingsItem( "restart_crashed_session_script",
+                               "Script to be called after session crash",
+                               argSettings, false ) },
     adminUsers{ GetAdminUsers( argSettings ) },
     installedLaTeXHeaders{ DetectInstalledLaTeXHeaders() },
     installedZTreeVersions{ DetectInstalledzTreeVersions() },

src/Lib/settings.h

@@ -54,6 +54,7 @@ public:
     const QString latexCmd;
     const QString lcInstDir;
     const QString localUserName;
+    const QString localzLeafSize;
     const QString lprCmd;
     const QString netstatCmd;
     const QString netwBrdAddr;
@@ -78,6 +79,7 @@ public:
     const QString wmctrlCmd;
     const QString xsetCmd;
     const QString zTreeInstDir;
+    const QString restartCrashedSessionScript;
     const QStringList adminUsers;
     const QStringList installedLaTeXHeaders;
     const QStringList installedZTreeVersions;

src/Lib/ztree.cpp

@@ -30,7 +30,7 @@ lc::ZTree::ZTree( const QString &argZTreeDataTargetPath, const int &argZTreePort
                   const QString &argZTreeVersionPath, QObject *argParent ) :
     QObject{ argParent }
 {
-    QStringList arguments{ QStringList{} << "0x00000001" << settings->wineCmd
+    QStringList arguments{ QStringList{} << "-c" << "0" << settings->wineCmd
                                          << QString{ settings->zTreeInstDir + "/zTree_"
                                             + argZTreeVersionPath + "/ztree.exe" }
                                          << "/datadir" << QString{ "Z:/" + argZTreeDataTargetPath }
@@ -42,6 +42,7 @@ lc::ZTree::ZTree( const QString &argZTreeDataTargetPath, const int &argZTreePort
 
     QProcessEnvironment env = QProcessEnvironment::systemEnvironment();
     zTreeInstance.setProcessEnvironment( env );
+    zTreeInstance.setWorkingDirectory( QDir::homePath() );
     zTreeInstance.start( settings->tasksetCmd, arguments, QIODevice::NotOpen );
     connect( &zTreeInstance, SIGNAL( finished( int ) ),
              this, SIGNAL( ZTreeClosed( int ) ) );

src/mainwindow.cpp

@@ -475,7 +475,12 @@ void lc::MainWindow::on_PBShutdown_clicked() {
     for ( QModelIndexList::ConstIterator it = activatedItems.cbegin(); it != activatedItems.cend(); ++it ) {
         if ( ( *it ).data( Qt::DisplayRole ).type() != 0 ) {
             Client *client = static_cast< Client* >( ( *it ).data( Qt::UserRole ).value< void * >() );
-            client->Shutdown();
+            // Do not shut down the server itself
+            if ( client->name == "self"){
+                QMessageBox::information(NULL, "Shutdown canceled", "It is not allowed to shutdown the server itself via labcontrol!");
+            } else {
+                client->Shutdown();
+            }
         }
     }
 }
@@ -672,6 +677,10 @@ void lc::MainWindow::StartLocalzLeaf( QString argzLeafName, QString argzLeafVers
               << QString{ settings->zTreeInstDir + "/zTree_" + argzLeafVersion + "/zleaf.exe" }
               << "/server" << "127.0.0.1" << "/channel"
               << QString::number( argzTreePort - 7000 ) << "/name" << argzLeafName;
+    if ( !settings->localzLeafSize.isEmpty() ) {
+      arguments << "/size" << QString{ settings->localzLeafSize };
+    }
+	      
     startProc.startDetached( settings->tasksetCmd, arguments );
 }
 
@@ -718,3 +727,12 @@ void lc::MainWindow::UpdateClientsTableView() {
         }
     }
 }
+
+// TODO: Implement the functionality of the script in here
+void lc::MainWindow::on_PBrestartCrashedSession_clicked() {
+    QProcess startProc;
+    startProc.setProcessEnvironment( QProcessEnvironment::systemEnvironment() );
+    if ( !settings->restartCrashedSessionScript.isEmpty() ) {
+        startProc.startDetached( settings->restartCrashedSessionScript);
+    }
+}

src/mainwindow.h

@@ -116,6 +116,7 @@ private slots:
                                QString argAnonymousReceiptsPlaceholder,
                                QString argLatexHeaderName,
                                QString argDateString );
+    void on_PBrestartCrashedSession_clicked();
 };
 
 }

src/mainwindow.ui

@@ -7,7 +7,7 @@
     <x>0</x>
     <y>0</y>
     <width>800</width>
-    <height>864</height>
+    <height>900</height>
    </rect>
   </property>
   <property name="windowTitle">
@@ -186,6 +186,13 @@
                </item>
               </layout>
              </item>
+             <item>
+              <widget class="QPushButton" name="PBrestartCrashedSession">
+               <property name="text">
+                <string>Restart crashed session</string>
+               </property>
+              </widget>
+             </item>
             </layout>
            </widget>
           </item>
@@ -203,7 +210,13 @@
               </widget>
              </item>
              <item>
-              <widget class="QComboBox" name="CBWebcamChooser"/>
+              <widget class="QComboBox" name="CBWebcamChooser">
+               <item>
+                <property name="text">
+                 <string>Choose webcam</string>
+                </property>
+               </item>
+              </widget>
              </item>
              <item>
               <widget class="QPushButton" name="PBDeactivateScreensaver">
@@ -261,7 +274,7 @@
                  <item>
                   <widget class="QPushButton" name="PBChooseFile">
                    <property name="text">
-                    <string>Choose file</string>
+                    <string>Choose folder</string>
                    </property>
                   </widget>
                  </item>
@@ -277,7 +290,7 @@
                <item>
                 <widget class="QPushButton" name="PBBeamFile">
                  <property name="text">
-                  <string>Beam file to ~/media4zTree</string>
+                  <string>Beam folder to ~/media4zTree on all clients</string>
                  </property>
                 </widget>
                </item>

src/sessionstarter.cpp

@@ -186,6 +186,16 @@ void lc::SessionStarter::on_PBStartSession_clicked() {
                             static_cast< quint16 >( ui->SBPort->value() ),
                             ui->CBzTreeVersion->currentText() );
 
+    //Start z-Leaf on selected clients if checkbox is activated
+    if( ui->ChBautoStartClientZleaf->isChecked() ) {
+        for ( auto cit = activatedItems.cbegin(); cit != activatedItems.cend(); ++cit ) {
+            if ( ( *cit ).data( Qt::DisplayRole ).type() != 0 ) {
+                Client *client = static_cast< Client* >( ( *cit ).data( Qt::UserRole ).value< void * >() );
+                client->StartZLeaf( nullptr );
+            }
+        }
+    }
+
     this->deleteLater();
 }
 

src/sessionstarter.ui

@@ -7,7 +7,7 @@
     <x>0</x>
     <y>0</y>
     <width>640</width>
-    <height>576</height>
+    <height>600</height>
    </rect>
   </property>
   <property name="windowTitle">
@@ -254,6 +254,12 @@ Warning: If this is disabled no receipts will be printed for ANY participant who
    </item>
    <item>
     <widget class="QCheckBox" name="ChBSessionWithoutClients">
+     <property name="sizePolicy">
+      <sizepolicy hsizetype="Minimum" vsizetype="Fixed">
+       <horstretch>0</horstretch>
+       <verstretch>0</verstretch>
+      </sizepolicy>
+     </property>
      <property name="toolTip">
       <string>This allows an experimenter to override the normally hard requirement of choosing clients to be attached to the started session and start a session without attached clients.</string>
      </property>
@@ -262,6 +268,13 @@ Warning: If this is disabled no receipts will be printed for ANY participant who
      </property>
     </widget>
    </item>
+   <item>
+    <widget class="QCheckBox" name="ChBautoStartClientZleaf">
+     <property name="text">
+      <string>Start z-Leaf on clients with the session</string>
+     </property>
+    </widget>
+   </item>
    <item>
     <widget class="QPushButton" name="PBStartSession">
      <property name="toolTip">