Merge branch 'master' of https://github.com/texstudio-org/texstudio

Author: sunderme

src/collaborationmanager.cpp

@@ -22,7 +22,7 @@ CollaborationManager::~CollaborationManager()
     }
 }
 /*!
- * \brief start ethersync client process
+ * \brief start teamtype client process
  * \param folder directory in which to start
  * \return successful start
  */
@@ -77,7 +77,7 @@ bool CollaborationManager::isClientRunning()
 }
 /*!
  * \brief start host server
- * ethersync share --directory <folder>
+ * teamtype share --directory <folder>
  * \param folder directory which is synced
  * \return successful start
  */
@@ -112,7 +112,7 @@ bool CollaborationManager::startHostServer(const QString folder)
 }
 /*!
  * \brief start guest server
- * ethersync join <code> --directory <folder>
+ * teamtype join <code> --directory <folder>
  * \param folder directory which is synced, should be empty and will be filled by the host
  * \param code the code provided by the host
  * \return successful start
@@ -126,7 +126,7 @@ bool CollaborationManager::startGuestServer(const QString folder,const QString &
     const QString binPath=m_conf->ce_toolPath;
     QString folderName=m_conf->ce_clientPath;
     QDir dir(folderName);
-    dir.mkpath(".ethersync");
+    dir.mkpath(".teamtype");
     if(!binPath.isEmpty()){
         // run binPath share folder
         collabServerProcess = new QProcess(this);
@@ -172,10 +172,10 @@ bool CollaborationManager::isServerRunning()
     return (collabServerProcess!=nullptr);
 }
 /*!
- * \brief check if file is in a folder with .ethersync subfolder
+ * \brief check if file is in a folder with .teamtype subfolder
  * This hints at a running server
  * \param filename
- * \return folder was already used with ethersync
+ * \return folder was already used with teamtype
  */
 bool CollaborationManager::isFileLocatedInCollabFolder(const QString &filename)
 {
@@ -185,14 +185,14 @@ bool CollaborationManager::isFileLocatedInCollabFolder(const QString &filename)
         return fi.absolutePath()==m_collabClientFolder;
     }
     QDir dir=fi.absoluteDir();
-    if(dir.exists(".ethersync")){
+    if(dir.exists(".ethersync")||dir.exists(".teamtype")){
         // client is not running, but server might be
         return true;
     }
     return false;
 }
 /*!
- * \brief reset starting check for ethersync
+ * \brief reset starting check for teamtype
  * If starting failed once, all further attempts are moot
  * Here this check is reset, e.g. if user changed path in settings
  */
@@ -450,12 +450,12 @@ void CollaborationManager::readyCollabServerStandardOutput()
     if(buffer.contains("Connected to peer:")){
         emit guestServerSuccessfullyStarted();
     }
-    if(buffer.contains("\tethersync join")){
+    if(buffer.contains("\tteamtype join")){
         // extract code
         QStringList lines= buffer.split("\n", Qt::SkipEmptyParts);
         for(QString line : lines){
             line=line.trimmed();
-            if(line.startsWith("ethersync join")){
+            if(line.startsWith("teamtype join")){
                 m_code=line.mid(15);
                 emit hostServerSuccessfullyStarted();
             }

src/collaborationmanager.h

@@ -61,8 +61,8 @@ private slots:
     ConfigManager *m_conf=nullptr;
     LatexDocuments *m_docs=nullptr;
 
-    QProcess *collabServerProcess = nullptr; /// for host server: ethersync share
-    QProcess *collabClientProcess = nullptr; /// for client: ethersync client
+    QProcess *collabServerProcess = nullptr; /// for host server: teamtype share
+    QProcess *collabClientProcess = nullptr; /// for client: teamtype client
 
     bool m_startingEthersyncFailed = false; /// if command start fails, all further attempts are moot
     QString m_errorMessage; /// last error message

src/configdialog.ui

@@ -105,7 +105,7 @@
           </size>
          </property>
          <property name="currentIndex">
-          <number>8</number>
+          <number>16</number>
          </property>
          <widget class="QWidget" name="pageGeneral">
           <layout class="QVBoxLayout">
@@ -137,8 +137,8 @@
                <rect>
                 <x>0</x>
                 <y>0</y>
-                <width>808</width>
-                <height>696</height>
+                <width>550</width>
+                <height>520</height>
                </rect>
               </property>
               <layout class="QVBoxLayout" name="verticalLayout">
@@ -738,8 +738,8 @@
                <rect>
                 <x>0</x>
                 <y>0</y>
-                <width>837</width>
-                <height>608</height>
+                <width>568</width>
+                <height>542</height>
                </rect>
               </property>
               <layout class="QVBoxLayout" name="verticalLayout_17">
@@ -1584,8 +1584,8 @@ Then you can select a new shortcut by one of the following ways:
                <rect>
                 <x>0</x>
                 <y>0</y>
-                <width>1128</width>
-                <height>526</height>
+                <width>637</width>
+                <height>414</height>
                </rect>
               </property>
               <layout class="QGridLayout">
@@ -2043,8 +2043,8 @@ Then you can select a new shortcut by one of the following ways:
                <rect>
                 <x>0</x>
                 <y>0</y>
-                <width>1128</width>
-                <height>1641</height>
+                <width>1086</width>
+                <height>1329</height>
                </rect>
               </property>
               <layout class="QVBoxLayout" name="verticalLayout_8">
@@ -3337,8 +3337,8 @@ them here.</string>
                <rect>
                 <x>0</x>
                 <y>0</y>
-                <width>622</width>
-                <height>1030</height>
+                <width>1086</width>
+                <height>783</height>
                </rect>
               </property>
               <layout class="QVBoxLayout" name="verticalLayout_9">
@@ -4021,8 +4021,8 @@ Examples:
                <rect>
                 <x>0</x>
                 <y>0</y>
-                <width>449</width>
-                <height>280</height>
+                <width>1096</width>
+                <height>419</height>
                </rect>
               </property>
               <layout class="QVBoxLayout" name="verticalLayout_13">
@@ -4297,8 +4297,8 @@ Examples:
                <rect>
                 <x>0</x>
                 <y>0</y>
-                <width>546</width>
-                <height>629</height>
+                <width>1086</width>
+                <height>486</height>
                </rect>
               </property>
               <layout class="QVBoxLayout" name="verticalLayout_16">
@@ -4800,8 +4800,8 @@ Note: Changing this setting will only affect documents that are opened afterward
                <rect>
                 <x>0</x>
                 <y>0</y>
-                <width>430</width>
-                <height>203</height>
+                <width>1096</width>
+                <height>419</height>
                </rect>
               </property>
               <layout class="QGridLayout">
@@ -5066,7 +5066,7 @@ Note: Changing this setting will only affect documents that are opened afterward
                 </property>
                 <item>
                  <property name="text">
-                  <string>ethersync</string>
+                  <string>teamtype</string>
                  </property>
                 </item>
                </widget>

src/configmanager.cpp

@@ -714,7 +714,7 @@ ConfigManager::ConfigManager(QObject *parent): QObject (parent),
 
     // collaborative editing
     registerOption("CollaborativeEditing/Tool",&ce_tool,0,&pseudoDialog->comboBoxCollaborativeTool);
-    registerOption("CollaborativeEditing/ToolPath",&ce_toolPath,"ethersync",&pseudoDialog->lineEditCollaborativeToolPath);
+    registerOption("CollaborativeEditing/ToolPath",&ce_toolPath,"teamtype",&pseudoDialog->lineEditCollaborativeToolPath);
     const QString pth=QStandardPaths::writableLocation(QStandardPaths::DocumentsLocation);
     registerOption("CollaborativeEditing/ClientFolder",&ce_clientPath,pth+QDir::separator()+tr("txsCollaborationFolder"),&pseudoDialog->lineEditCollaborativeClientFolder);
     registerOption("CollaborativeEditing/UserName",&ce_userName,"txs",&pseudoDialog->lineEditCollaborativeUserName);

src/qcodeedit/lib/qeditor.cpp

@@ -6457,7 +6457,7 @@ void QEditor::paintMarks(){
 }
 /*!
  * \brief set external curso
- * \param userId given by ethersync
+ * \param userId given by teamtype
  * \param c cursor to set
  */
 void QEditor::setExternalCursor(const QString &userId, QDocumentCursor &c)

src/texstudio.cpp

@@ -6764,7 +6764,7 @@ void Texstudio::connectCollabServer()
     if (ok && !text.isEmpty()){
         // trim join code
         text=text.trimmed();
-        if(text.startsWith("ethersync join ")) text=text.mid(15);
+        if(text.startsWith("teamtype join ")) text=text.mid(15);
         // start server
         const QString folderName=configManager.ce_clientPath;
         collabManager->startGuestServer(folderName,text);
@@ -6868,7 +6868,7 @@ void Texstudio::updateCollaborationEditors(int startLine, int startCol, int endL
 }
 /*!
  * \brief register file for collaboration
- * Check if file is in a ethersync folder and try to start client if possible
+ * Check if file is in a teamtype folder and try to start client if possible
  * \param filename
  * \return operation successful
  */
@@ -6966,7 +6966,7 @@ void Texstudio::hostServerSuccessfullyStarted()
         QSize iconSize = QSize(iconWidth, iconWidth);
         QIcon icon = getRealIconCached("network-connect");
         statusLabelCollab->setPixmap(icon.pixmap(iconSize));
-        statusLabelCollab->setToolTip(tr("Collaboration: Connected in folder %1\nto join: ethersync join %2").arg(collabManager->collabClientFolder(), joinCode));
+        statusLabelCollab->setToolTip(tr("Collaboration: Connected in folder %1\nto join: teamtype join %2").arg(collabManager->collabClientFolder(), joinCode));
         if(statusLabelCollab->actions().isEmpty()){
             QAction *act=new QAction(tr("Copy access code"),this);
             connect(act,&QAction::triggered,this,&Texstudio::copyCollabLinkToClipboard);
@@ -7012,7 +7012,7 @@ void Texstudio::copyCollabLinkToClipboard()
     const QString joinCode=collabManager->codeForConnectingGuest();
     if(joinCode.isEmpty()) return;
     QClipboard *clipboard = QGuiApplication::clipboard();
-    clipboard->setText("ethersync join "+joinCode);
+    clipboard->setText("teamtype join "+joinCode);
 }
 
 //////////////// MESSAGES - LOG FILE///////////////////////

utilities/manual/build/html/CHANGELOG.html

@@ -7,17 +7,22 @@
 <meta property="og:type" content="website" />
 <meta property="og:url" content="CHANGELOG.html" />
 <meta property="og:site_name" content="TeXstudio" />
-<meta property="og:description" content="TeXstudio 4.9.0: implement peer-to-peer collaborative editing with ethersync, see manual, fix table insert from libreoffice calc, see#4186, fix stylesheet application on windowed pdf viewer, see#41..." />
-<meta name="description" content="TeXstudio 4.9.0: implement peer-to-peer collaborative editing with ethersync, see manual, fix table insert from libreoffice calc, see#4186, fix stylesheet application on windowed pdf viewer, see#41..." />
+<meta property="og:description" content="TeXstudio 4.9.0: implement peer-to-peer collaborative editing with teamtype, see manual, fix table insert from libreoffice calc, see#4186, fix stylesheet application on windowed pdf viewer, see#418..." />
+<meta property="og:image:width" content="1146" />
+<meta property="og:image:height" content="600" />
+<meta property="og:image" content="_images/social_previews/summary_CHANGELOG_42d8393c.png" />
+<meta property="og:image:alt" content="TeXstudio 4.9.0: implement peer-to-peer collaborative editing with teamtype, see manual, fix table insert from libreoffice calc, see#4186, fix stylesheet application on windowed pdf viewer, see#418..." />
+<meta name="description" content="TeXstudio 4.9.0: implement peer-to-peer collaborative editing with teamtype, see manual, fix table insert from libreoffice calc, see#4186, fix stylesheet application on windowed pdf viewer, see#418..." />
+<meta name="twitter:card" content="summary_large_image" />
 <link rel="index" title="Index" href="genindex.html" /><link rel="search" title="Search" href="search.html" /><link rel="prev" title="Background information" href="background.html" />
 
-    <link rel="shortcut icon" href="_static/texstudio.ico"/><!-- Generated with Sphinx 7.4.7 and Furo 2025.07.19 -->
+    <link rel="shortcut icon" href="_static/texstudio.ico"/><!-- Generated with Sphinx 8.2.3 and Furo 2024.08.06 -->
         <title>CHANGELOG - TeXstudio 4.9.0 documentation</title>
-      <link rel="stylesheet" type="text/css" href="_static/pygments.css?v=03e43079" />
-    <link rel="stylesheet" type="text/css" href="_static/styles/furo.css?v=25af2a20" />
+      <link rel="stylesheet" type="text/css" href="_static/pygments.css?v=fa44fd50" />
+    <link rel="stylesheet" type="text/css" href="_static/styles/furo.css?v=ad9e2e31" />
     <link rel="stylesheet" type="text/css" href="_static/tabs.css?v=4c969af8" />
     <link rel="stylesheet" type="text/css" href="_static/sphinx-design.min.css?v=95c83b7e" />
-    <link rel="stylesheet" type="text/css" href="_static/styles/furo-extensions.css?v=8dab3a3b" />
+    <link rel="stylesheet" type="text/css" href="_static/styles/furo-extensions.css?v=4aa03575" />
 
 
 
@@ -197,6 +202,7 @@
 
       <div class="sidebar-sticky"><a class="sidebar-brand" href="index.html">
 
+  
   <span class="sidebar-brand-text">TeXstudio 4.9.0 documentation</span>
 
 </a><form class="sidebar-search-container" method="get" action="search.html" role="search">
@@ -260,7 +266,7 @@ <h1>CHANGELOG<a class="headerlink" href="#changelog" title="Link to this heading
 <section id="texstudio-4-9-0">
 <h2>TeXstudio 4.9.0<a class="headerlink" href="#texstudio-4-9-0" title="Link to this heading">¶</a></h2>
 <ul class="simple">
-<li><p>implement peer-to-peer collaborative editing with ethersync, <a class="reference external" href="https://texstudio-org.github.io/editing.html#collaborative-editing-pair-programming">see manual</a></p></li>
+<li><p>implement peer-to-peer collaborative editing with teamtype, <a class="reference external" href="https://texstudio-org.github.io/editing.html#collaborative-editing-pair-programming">see manual</a></p></li>
 <li><p>fix table insert from libreoffice calc, see <a class="reference external" href="https://github.com/texstudio-org/texstudio/issues/4186">#4186</a></p></li>
 <li><p>fix stylesheet application on windowed pdf viewer, see <a class="reference external" href="https://github.com/texstudio-org/texstudio/discussions/4185">#4185</a></p></li>
 <li><p>fix showing log for labels with colon in its name, see <a class="reference external" href="https://github.com/texstudio-org/texstudio/issues/4184">#4184</a></p></li>
@@ -2090,9 +2096,9 @@ <h2>Texmaker 1.2<a class="headerlink" href="#texmaker-1-2" title="Link to this h
     </aside>
   </div>
 </div><script src="_static/documentation_options.js?v=e33213b2"></script>
-    <script src="_static/doctools.js?v=9a2dae69"></script>
+    <script src="_static/doctools.js?v=9bcbadda"></script>
     <script src="_static/sphinx_highlight.js?v=dc90522c"></script>
-    <script src="_static/scripts/furo.js?v=46bd48cc"></script>
+    <script type="module" src="_static/scripts/furo.js?v=d32f1409"></script>
     <script src="_static/tabs.js?v=3ee01567"></script>
     <script src="_static/design-tabs.js?v=36754332"></script>
     </body>

utilities/manual/build/html/_static/basic.css

@@ -1,12 +1,5 @@
 /*
- * basic.css
- * ~~~~~~~~~
- *
  * Sphinx stylesheet -- basic theme.
- *
- * :copyright: Copyright 2007-2024 by the Sphinx team, see AUTHORS.
- * :license: BSD, see LICENSE for details.
- *
  */
 
 /* -- main layout ----------------------------------------------------------- */
@@ -115,15 +108,11 @@ img {
 /* -- search page ----------------------------------------------------------- */
 
 ul.search {
-    margin: 10px 0 0 20px;
-    padding: 0;
+    margin-top: 10px;
 }
 
 ul.search li {
-    padding: 5px 0 5px 20px;
-    background-image: url(file.png);
-    background-repeat: no-repeat;
-    background-position: 0 7px;
+    padding: 5px 0;
 }
 
 ul.search li a {
@@ -752,14 +741,6 @@ abbr, acronym {
     cursor: help;
 }
 
-.translated {
-    background-color: rgba(207, 255, 207, 0.2)
-}
-
-.untranslated {
-    background-color: rgba(255, 207, 207, 0.2)
-}
-
 /* -- code displays --------------------------------------------------------- */
 
 pre {

utilities/manual/build/html/_static/doctools.js

@@ -1,12 +1,5 @@
 /*
- * doctools.js
- * ~~~~~~~~~~~
- *
  * Base JavaScript utilities for all Sphinx HTML documentation.
- *
- * :copyright: Copyright 2007-2024 by the Sphinx team, see AUTHORS.
- * :license: BSD, see LICENSE for details.
- *
  */
 "use strict";
 

utilities/manual/build/html/_static/language_data.js

@@ -1,13 +1,6 @@
 /*
- * language_data.js
- * ~~~~~~~~~~~~~~~~
- *
  * This script contains the language-specific data used by searchtools.js,
  * namely the list of stopwords, stemmer, scorer and splitter.
- *
- * :copyright: Copyright 2007-2024 by the Sphinx team, see AUTHORS.
- * :license: BSD, see LICENSE for details.
- *
  */
 
 var stopwords = ["a", "and", "are", "as", "at", "be", "but", "by", "for", "if", "in", "into", "is", "it", "near", "no", "not", "of", "on", "or", "such", "that", "the", "their", "then", "there", "these", "they", "this", "to", "was", "will", "with"];