.cirrus.yml

@@ -309,7 +309,7 @@ macos_task:
     DEPLOY: "true"
     QT_VERSION: Qt6
     ARCH: armv8
-    TARGET_PLATFORM: "macOS_12.4+"
+    PLATFORM: "macOS_12.4+"
     MACOS_DEPLOYMENT_TARGET: 12.0
     ENABLE_CCACHE: true
   matrix:

appveyor.yml

@@ -54,7 +54,7 @@ environment:
       VSINSTALLDIR: "C:\\Program Files\\Microsoft Visual Studio\\2022\\Community\\"
       ARCH: x64
       PYTHON: "C:\\Python311-x64"
-      TARGET_PLATFORM: "Windows10+"
+      PLATFORM: "Windows10+"
       CHOCOLATEY_PACKAGES: false
       WINDEPLOYQT_BIN_PATH: "undefined"
       WINDEPLOYQT_COMPILER_RUNTIME: "true"
@@ -76,7 +76,7 @@ environment:
       MINGW_PATH: C:\Qt\Tools\mingw810_32\bin
       ARCH: x86
       PYTHON: "C:\\Python311"
-      TARGET_PLATFORM: "Windows7+"
+      PLATFORM: "Windows7+"
       CHOCOLATEY_PACKAGES: false
       WINDEPLOYQT_BIN_PATH: "undefined"
       WINDEPLOYQT_COMPILER_RUNTIME: "true"
@@ -98,7 +98,7 @@ environment:
 #      MINGW_PATH: C:\ProgramData\mingw64\mingw64\bin
 #      ARCH: x64
 #      PYTHON: "C:\\Python311-x64"
-#      TARGET_PLATFORM: "Windows10+"
+#      PLATFORM: "Windows10+"
 #      CHOCOLATEY_PACKAGES: true
 #      CHOCOLATEY_MINGW_VERSION: 13.2.0
 #      WINDEPLOYQT_BIN_PATH: "undefined"
@@ -115,7 +115,7 @@ environment:
       BUILD_SYSTEM: "qbs"
       ARCH: x64
       XCODE_VERSION: 14.1
-      TARGET_PLATFORM: "macOS_10.13+"
+      PLATFORM: "macOS_10.13+"
       MACOS_DEPLOYMENT_TARGET: 10.13
       MULTI_BUNDLE: true
       DEPLOY: true
@@ -128,7 +128,7 @@ environment:
       BUILD_SYSTEM: "qbs"
       ARCH: x64
       XCODE_VERSION: 14.1
-      TARGET_PLATFORM: "macOS_10.13+"
+      PLATFORM: "macOS_10.13+"
       MACOS_DEPLOYMENT_TARGET: 10.13
       MULTI_BUNDLE: false
       DEPLOY: true
@@ -141,7 +141,7 @@ environment:
       BUILD_SYSTEM: "qbs"
       ARCH: x64
       XCODE_VERSION: 14.1
-      TARGET_PLATFORM: "macOS_11+"
+      PLATFORM: "macOS_11+"
       MACOS_DEPLOYMENT_TARGET: 11.0
       MULTI_BUNDLE: true
       DEPLOY: true
@@ -154,7 +154,7 @@ environment:
       BUILD_SYSTEM: "qbs"
       ARCH: x64
       XCODE_VERSION: 14.1
-      TARGET_PLATFORM: "macOS_11+"
+      PLATFORM: "macOS_11+"
       MACOS_DEPLOYMENT_TARGET: 11.0
       MULTI_BUNDLE: false
       DEPLOY: true
@@ -168,7 +168,7 @@ environment:
       MINGW_PATH: C:\Qt\Tools\mingw810_32\bin
       ARCH: x86
       PYTHON: "C:\\Python311"
-      TARGET_PLATFORM: "Windows7+"
+      PLATFORM: "Windows7+"
       DEPLOY: false
 
     - job_name: Windows_Qt_5_15_(qbs_GCC_x64)
@@ -185,7 +185,7 @@ environment:
       MINGW_PATH: C:\Qt\Tools\mingw810_64\bin
       ARCH: x64
       PYTHON: "C:\\Python311-x64"
-      TARGET_PLATFORM: "Windows7+"
+      PLATFORM: "Windows7+"
       CHOCOLATEY_PACKAGES: false
       WINDEPLOYQT_BIN_PATH: "undefined"
       WINDEPLOYQT_COMPILER_RUNTIME: "true"
@@ -205,7 +205,7 @@ environment:
       VSVER: 16
       ARCH: x64
       PYTHON: "C:\\Python311-x64"
-      TARGET_PLATFORM: "Windows7+"
+      PLATFORM: "Windows7+"
       CHOCOLATEY_PACKAGES: false
       WINDEPLOYQT_BIN_PATH: "undefined"
       WINDEPLOYQT_COMPILER_RUNTIME: "true"
@@ -222,7 +222,7 @@ environment:
       MINGW_PATH: C:\Qt\Tools\mingw810_64\bin
       ARCH: x64
       PYTHON: "C:\\Python311-x64"
-      TARGET_PLATFORM: "Windows7+"
+      PLATFORM: "Windows7+"
       DEPLOY: false
 
     - job_name: Windows_Qt_5_15_(nmake_MSVC_x64)
@@ -233,7 +233,7 @@ environment:
       VSVER: 16
       ARCH: x64
       PYTHON: "C:\\Python311-x64"
-      TARGET_PLATFORM: "Windows7+"
+      PLATFORM: "Windows7+"
       DEPLOY: false
 
     - job_name: MacOS_10_15_Qt_5_15 (make)
@@ -244,7 +244,7 @@ environment:
       BUILD_SYSTEM: "make"
       ARCH: x64
       XCODE_VERSION: 12.3
-      TARGET_PLATFORM: "macOS_10.13+"
+      PLATFORM: "macOS_10.13+"
       DEPLOY: false 
 
 matrix:

dist/win/inno/valentina.iss

@@ -1,4 +1,4 @@
-; Script generated by the Inno Script Studio Wizard.
+; Script generated by the Inno Script Studio Wizard.
 ; SEE THE DOCUMENTATION FOR DETAILS ON CREATING INNO SETUP SCRIPT FILES!
 
 ; [NOTE] These are passed from Qbs

scripts/appveyor-deploy.ps1

@@ -1,7 +1,7 @@
 $env:BUILD_FOLDER = "$env:APPVEYOR_BUILD_FOLDER\build";
 $env:INSTALL_ROOT = "$env:BUILD_FOLDER\install-root\valentina";
 
-$file_name = "valentina-$env:TARGET_PLATFORM-$env:COMPILER-$env:ARCH-$env:QT_VERSION-$env:APPVEYOR_REPO_BRANCH-$env:APPVEYOR_REPO_COMMIT.exe";
+$file_name = "valentina-$env:PLATFORM-$env:COMPILER-$env:ARCH-$env:QT_VERSION-$env:APPVEYOR_REPO_BRANCH-$env:APPVEYOR_REPO_COMMIT.exe";
 
 if($env:DEPLOY -eq "true") {
     Write-Host "[CI] Preparing installer." -ForegroundColor Green;

scripts/cirrus-deploy.sh

@@ -22,9 +22,9 @@ check_failure() {
 if [[ "$DEPLOY" == "true" ]]; then
     print_info "Start labeling.";
     if [[ "$MULTI_BUNDLE" == "false" ]]; then
-      mv $CIRRUS_WORKING_DIR/build/install-root/share/valentina.dmg $CIRRUS_WORKING_DIR/build/install-root/share/valentina-${TARGET_PLATFORM}-${QT_VERSION}-${ARCH}-${CIRRUS_BRANCH}-${CIRRUS_CHANGE_IN_REPO}.dmg;
+      mv $CIRRUS_WORKING_DIR/build/install-root/share/valentina.dmg $CIRRUS_WORKING_DIR/build/install-root/share/valentina-${PLATFORM}-${QT_VERSION}-${ARCH}-${CIRRUS_BRANCH}-${CIRRUS_CHANGE_IN_REPO}.dmg;
     else
-      mv $CIRRUS_WORKING_DIR/build/install-root/share/valentina.dmg $CIRRUS_WORKING_DIR/build/install-root/share/valentina-${TARGET_PLATFORM}-${QT_VERSION}-${ARCH}-${CIRRUS_BRANCH}-multibundle-${CIRRUS_CHANGE_IN_REPO}.dmg;
+      mv $CIRRUS_WORKING_DIR/build/install-root/share/valentina.dmg $CIRRUS_WORKING_DIR/build/install-root/share/valentina-${PLATFORM}-${QT_VERSION}-${ARCH}-${CIRRUS_BRANCH}-multibundle-${CIRRUS_CHANGE_IN_REPO}.dmg;
     fi
     check_failure "Unable to label Valentina DMG."; 
 
@@ -34,9 +34,9 @@ if [[ "$DEPLOY" == "true" ]]; then
 
     print_info "Start uploading.";
     if [[ "$MULTI_BUNDLE" == "false" ]]; then
-      python3 $CIRRUS_WORKING_DIR/scripts/deploy.py upload $ACCESS_TOKEN $CIRRUS_WORKING_DIR/build/install-root/share/valentina-${TARGET_PLATFORM}-${QT_VERSION}-${ARCH}-${CIRRUS_BRANCH}-${CIRRUS_CHANGE_IN_REPO}.dmg "/0.7.x/Mac OS X/valentina-${TARGET_PLATFORM}-${QT_VERSION}-${ARCH}-${CIRRUS_BRANCH}-${CIRRUS_CHANGE_IN_REPO}.dmg";
+      python3 $CIRRUS_WORKING_DIR/scripts/deploy.py upload $ACCESS_TOKEN $CIRRUS_WORKING_DIR/build/install-root/share/valentina-${PLATFORM}-${QT_VERSION}-${ARCH}-${CIRRUS_BRANCH}-${CIRRUS_CHANGE_IN_REPO}.dmg "/0.7.x/Mac OS X/valentina-${PLATFORM}-${QT_VERSION}-${ARCH}-${CIRRUS_BRANCH}-${CIRRUS_CHANGE_IN_REPO}.dmg";
     else
-      python3 $CIRRUS_WORKING_DIR/scripts/deploy.py upload $ACCESS_TOKEN $CIRRUS_WORKING_DIR/build/install-root/share/valentina-${TARGET_PLATFORM}-${QT_VERSION}-${ARCH}-${CIRRUS_BRANCH}-multibundle-${CIRRUS_CHANGE_IN_REPO}.dmg "/0.7.x/Mac OS X/valentina-${TARGET_PLATFORM}-${QT_VERSION}-${ARCH}-${CIRRUS_BRANCH}-multibundle-${CIRRUS_CHANGE_IN_REPO}.dmg";
+      python3 $CIRRUS_WORKING_DIR/scripts/deploy.py upload $ACCESS_TOKEN $CIRRUS_WORKING_DIR/build/install-root/share/valentina-${PLATFORM}-${QT_VERSION}-${ARCH}-${CIRRUS_BRANCH}-multibundle-${CIRRUS_CHANGE_IN_REPO}.dmg "/0.7.x/Mac OS X/valentina-${PLATFORM}-${QT_VERSION}-${ARCH}-${CIRRUS_BRANCH}-multibundle-${CIRRUS_CHANGE_IN_REPO}.dmg";
     fi
     check_failure "Unable to upload Valentina DMG.";
 

src/app/valentina/dialogs/dialoghistory.cpp

@@ -33,7 +33,6 @@
 #include "../vgeometry/vellipticalarc.h"
 #include "../vgeometry/vpointf.h"
 #include "../vgeometry/vsplinepath.h"
-#include "../vmisc/theme/vtheme.h"
 #include "../vmisc/vtablesearch.h"
 #include "../vmisc/vvalentinasettings.h"
 #include "../vtools/tools/drawTools/toolpoint/toolsinglepoint/toolcut/vtoolcutarc.h"
@@ -142,7 +141,7 @@ void DialogHistory::cellClicked(int row, int column)
 
         item = ui->tableWidget->item(row, 0);
         m_cursorRow = row;
-        item->setIcon(QIcon(VTheme::GetPixmapResource(QStringLiteral("icon"), QStringLiteral("32x32/put_after.png"))));
+        item->setIcon(QIcon("://icon/32x32/put_after.png"));
         const auto id = qvariant_cast<quint32>(item->data(Qt::UserRole));
         m_doc->blockSignals(true);
         row == ui->tableWidget->rowCount() - 1 ? m_doc->setCursor(0) : m_doc->setCursor(id);
@@ -177,8 +176,7 @@ void DialogHistory::ChangedCursor(quint32 id)
             QTableWidgetItem *oldCursorItem = ui->tableWidget->item(m_cursorRow, 0);
             oldCursorItem->setIcon(QIcon());
             m_cursorRow = i;
-            item->setIcon(
+            item->setIcon(QIcon("://icon/32x32/put_after.png"));
-                QIcon(VTheme::GetPixmapResource(QStringLiteral("icon"), QStringLiteral("32x32/put_after.png"))));
         }
     }
 }
@@ -236,12 +234,11 @@ void DialogHistory::FillTable()
     ui->tableWidget->setRowCount(count); // Real row count
     if (count > 0)
     {
-        ui->tableWidget->selectRow(0);
         m_cursorRow = CursorRow();
         QTableWidgetItem *item = ui->tableWidget->item(m_cursorRow, 0);
         // cppcheck-suppress unknownMacro
         SCASSERT(item != nullptr)
-        item->setIcon(QIcon(VTheme::GetPixmapResource(QStringLiteral("icon"), QStringLiteral("32x32/put_after.png"))));
+        item->setIcon(QIcon("://icon/32x32/put_after.png"));
     }
     ui->tableWidget->resizeColumnsToContents();
     ui->tableWidget->resizeRowsToContents();

src/app/valentina/dialogs/dialoghistory.ui

@@ -41,7 +41,8 @@
         <string notr="true"/>
        </property>
        <property name="icon">
-        <iconset theme="system-search"/>
+        <iconset theme="system-search">
+         <normaloff>.</normaloff>.</iconset>
        </property>
        <property name="shortcut">
         <string>Alt+Down</string>
@@ -93,6 +94,7 @@
        <property name="font">
         <font>
          <pointsize>14</pointsize>
+         <weight>75</weight>
          <italic>false</italic>
          <bold>true</bold>
         </font>
@@ -125,6 +127,7 @@
        <property name="font">
         <font>
          <pointsize>14</pointsize>
+         <weight>75</weight>
          <bold>true</bold>
         </font>
        </property>
@@ -159,6 +162,7 @@
        <property name="font">
         <font>
          <pointsize>14</pointsize>
+         <weight>75</weight>
          <bold>true</bold>
         </font>
        </property>
@@ -190,6 +194,7 @@
        <property name="font">
         <font>
          <pointsize>14</pointsize>
+         <weight>75</weight>
          <bold>true</bold>
         </font>
        </property>
@@ -223,10 +228,11 @@
         <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Find Previous &lt;span style=&quot; color:#888a85;&quot;&gt;%1&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
        </property>
        <property name="text">
-        <string notr="true"/>
+        <string notr="true"></string>
        </property>
        <property name="icon">
-        <iconset theme="go-up"/>
+        <iconset theme="go-up">
+         <normaloff>.</normaloff>.</iconset>
        </property>
        <property name="shortcut">
         <string>Shift+F3</string>
@@ -242,10 +248,11 @@
         <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Find Next %1&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
        </property>
        <property name="text">
-        <string notr="true"/>
+        <string notr="true"></string>
        </property>
        <property name="icon">
-        <iconset theme="go-down"/>
+        <iconset theme="go-down">
+         <normaloff>.</normaloff>.</iconset>
        </property>
        <property name="shortcut">
         <string>F3</string>
@@ -262,9 +269,6 @@
      <property name="alternatingRowColors">
       <bool>true</bool>
      </property>
-     <property name="selectionBehavior">
-      <enum>QAbstractItemView::SelectRows</enum>
-     </property>
      <attribute name="horizontalHeaderVisible">
       <bool>false</bool>
      </attribute>

src/libs/vmisc/share/resources/breezethemes/dark/stylesheet.qss

@@ -2397,26 +2397,51 @@ QSplitter::handle
     max-height: 0em;
 }
 
+/**
+ *  It's not possible to get satisfactory rounded borders here.
+ *  If you set the border to be negative, while adjusting the
+ *  widths, you get an asymmetrical curve which produces an
+ *  unappealing border.
+ */
 QProgressBar:horizontal,
 QProgressBar:vertical
 {
-  margin: 2px 0 0;
+    background-color: #626568;
-  background: #404040;
+    border: 0.9em solid #272729;
-  padding: 3px;
+    border-radius: 0.13em;
-  border-radius: 6px;
+    padding: 0em;
-  text-align: center;
+}
-  font: bold;
+
-  border-radius: 6px;
+QProgressBar:horizontal
-  border: 2px solid #3a6dad;
+{
+    height: 0.2em;
+    min-width: 6em;
+    text-align: right;
+    padding-left: -0.03em;
+    padding-right: -0.03em;
+    margin-top: 0.2em;
+    margin-bottom: 0.2em;
+    margin-right: 1.3em;
+}
+
+QProgressBar:vertical
+{
+    width: 0.2em;
+    min-height: 6em;
+    text-align: bottom;
+    padding-top: -0.03em;
+    padding-bottom: -0.03em;
+    margin-left: 0.2em;
+    margin-right: 0.2em;
+    margin-bottom: 0.41em;
 }
 
 QProgressBar::chunk:horizontal,
 QProgressBar::chunk:vertical
 {
-  background: qlineargradient(x1:0, y1:0, x2:0, y2:1,
+    background-color: #3d3d42;
-                              stop:0 #3d9cc7, stop:0.1 #3a6dad, stop: 0.9 #3a6dad, stop:1 #101c3f);
+    border: 0.9em transparent;
-  border: 1px solid #111111;
+    border-radius: 0.08em;
-  border-radius: 6px;
 }
 
 QScrollArea,

src/libs/vmisc/share/resources/icon.qrc

@@ -215,17 +215,5 @@
         <file>icon/dark/16x16/viewimage@2x.png</file>
         <file>icon/32x32/fold.png</file>
         <file>icon/32x32/fold@2x.png</file>
-        <file>icon/dark/32x32/expand2-hover@2x.png</file>
-        <file>icon/dark/32x32/expand2-hover.png</file>
-        <file>icon/dark/32x32/expand2-disabled@2x.png</file>
-        <file>icon/dark/32x32/expand2-disabled.png</file>
-        <file>icon/dark/32x32/expand2@2x.png</file>
-        <file>icon/dark/32x32/expand2.png</file>
-        <file>icon/dark/32x32/expand1-hover@2x.png</file>
-        <file>icon/dark/32x32/expand1-hover.png</file>
-        <file>icon/dark/32x32/expand1-disabled@2x.png</file>
-        <file>icon/dark/32x32/expand1-disabled.png</file>
-        <file>icon/dark/32x32/expand1@2x.png</file>
-        <file>icon/dark/32x32/expand1.png</file>
     </qresource>
 </RCC>

src/libs/vmisc/share/resources/icon/svg/dark/expand1-disabled.svg

@@ -10,22 +10,12 @@
    viewBox="0 0 592.381 592.381"
    xml:space="preserve"
    sodipodi:docname="expand1-disabled.svg"
-   inkscape:version="1.3.2 (1:1.3.2+202311252150+091e20ef0f)"
+   inkscape:version="1.3 (1:1.3+202307231459+0e150ed6c4)"
-   inkscape:export-filename="expand1-disabled@2x.png"
-   inkscape:export-xdpi="7.6799998"
-   inkscape:export-ydpi="7.6799998"
    xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
    xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
    xmlns="http://www.w3.org/2000/svg"
    xmlns:svg="http://www.w3.org/2000/svg"><defs
-   id="defs4">
+   id="defs4">&#10;	&#10;&#10;		&#10;	&#10;			&#10;			&#10;		</defs><sodipodi:namedview
-	
-
-		
-	
-			
-			
-		</defs><sodipodi:namedview
    id="namedview4"
    pagecolor="#ffffff"
    bordercolor="#666666"
@@ -37,20 +27,18 @@
    inkscape:zoom="0.70710678"
    inkscape:cx="-15.556349"
    inkscape:cy="103.23759"
-   inkscape:window-width="2560"
+   inkscape:window-width="1920"
-   inkscape:window-height="1372"
+   inkscape:window-height="1172"
-   inkscape:window-x="1920"
+   inkscape:window-x="0"
-   inkscape:window-y="0"
+   inkscape:window-y="240"
    inkscape:window-maximized="1"
-   inkscape:current-layer="Capa_1" />
+   inkscape:current-layer="Capa_1" />&#10;<path
-<path
    d="m 57.645,591.881 c 0.051,0 0.123,0 0.181,0 0.019,0 0.038,0 0.057,0 2.262,-0.01 4.106,-0.169 5.296,-0.287 l 154.786,-15.373 c 11.862,-1.178 22.962,-5.748 32.102,-13.217 8.463,-6.916 14.892,-16.042 18.591,-26.394 3.699,-10.352 4.51,-21.485 2.347,-32.199 -2.336,-11.569 -8.026,-22.14 -16.456,-30.568 l -9.312,-9.312 219.293,-219.295 9.312,9.312 c 11.374,11.375 26.441,17.639 42.425,17.639 14.367,0 28.298,-5.133 39.227,-14.453 11.819,-10.082 19.181,-24.206 20.727,-39.771 L 591.596,63.157 c 0.118,-1.186 0.275,-3.025 0.285,-5.276 C 591.943,42.574 586.027,28.172 575.222,17.323 564.416,6.475 550.038,0.5 534.736,0.5 h -0.017 c -0.011,0 -0.021,0 -0.033,0 -2.457,0.002 -4.459,0.183 -5.75,0.318 l -154.06,16.169 c -11.822,1.241 -22.872,5.854 -31.956,13.337 -8.415,6.934 -14.799,16.062 -18.459,26.398 -3.661,10.335 -4.446,21.446 -2.271,32.131 2.348,11.534 8.031,22.072 16.436,30.478 l 8.52,8.519 -219.295,219.294 -8.519,-8.519 c -11.375,-11.374 -26.441,-17.639 -42.426,-17.639 -14.311,0 -28.199,5.097 -39.107,14.353 -11.794,10.008 -19.185,24.049 -20.811,39.536 L 0.818,528.942 c -0.136,1.294 -0.314,3.285 -0.318,5.728 -0.017,15.271 5.92,29.635 16.719,40.446 10.798,10.811 25.155,16.765 40.426,16.765 z M 43.423,533.414 59.593,379.348 c 1.002,-9.553 9.017,-15.521 17.312,-15.521 4.278,0 8.631,1.588 12.134,5.091 l 27.993,27.993 c 2.988,2.987 6.903,4.48 10.819,4.48 3.916,0 7.832,-1.493 10.819,-4.48 L 396.91,138.669 c 5.976,-5.975 5.976,-15.662 0,-21.637 L 368.918,89.04 c -10.294,-10.294 -4.05,-27.926 10.431,-29.446 l 154.066,-16.17 c 0.434,-0.045 0.87,-0.083 1.306,-0.083 0.005,0 0.011,0 0.017,0 7.907,0 14.336,6.448 14.304,14.363 -0.002,0.408 -0.035,0.815 -0.076,1.221 l -15.374,154.807 c -0.954,9.602 -8.996,15.617 -17.323,15.617 -4.275,0 -8.629,-1.587 -12.133,-5.092 L 475.35,195.471 c -2.987,-2.988 -6.903,-4.481 -10.818,-4.481 -3.916,0 -7.831,1.494 -10.819,4.481 l -258.24,258.241 c -5.975,5.976 -5.975,15.663 0,21.638 l 28.786,28.786 c 10.327,10.326 4.007,28.012 -10.525,29.455 l -154.81,15.374 c -0.405,0.04 -0.813,0.074 -1.221,0.076 -0.02,0 -0.04,0 -0.059,0 -7.894,0 -14.313,-6.426 -14.304,-14.321 10e-4,-0.437 0.038,-0.872 0.083,-1.306 z"
    id="path1"
    style="fill:#dedede;fill-opacity:1;stroke:#dedede;stroke-opacity:1" /><path
    d="m 57.884,592.381 h -0.24 c -15.404,0 -29.886,-6.006 -40.78,-16.911 C 5.972,564.564 -0.017,550.074 0,534.669 c 0.003,-2.474 0.185,-4.482 0.321,-5.778 L 16.49,374.823 c 1.639,-15.616 9.091,-29.774 20.984,-39.865 10.998,-9.332 25.001,-14.472 39.431,-14.472 16.118,0 31.311,6.316 42.78,17.785 l 8.166,8.165 218.587,-218.586 -8.166,-8.166 c -8.475,-8.475 -14.205,-19.102 -16.572,-30.731 -2.192,-10.774 -1.4,-21.978 2.29,-32.398 3.69,-10.42 10.126,-19.624 18.612,-26.617 9.161,-7.547 20.303,-12.198 32.223,-13.449 L 528.885,0.321 c 1.301,-0.137 3.318,-0.319 5.802,-0.321 15.485,0 29.989,6.027 40.89,16.971 10.898,10.943 16.867,25.473 16.805,40.913 -0.01,2.285 -0.169,4.132 -0.287,5.324 L 576.72,218.014 c -1.56,15.694 -8.981,29.936 -20.9,40.102 -11.02,9.397 -25.065,14.572 -39.551,14.572 -16.117,0 -31.31,-6.316 -42.778,-17.786 l -8.959,-8.959 -218.589,218.587 8.959,8.959 c 8.499,8.498 14.236,19.156 16.592,30.823 2.181,10.803 1.363,22.029 -2.367,32.466 -3.73,10.437 -10.211,19.64 -18.745,26.612 -9.216,7.531 -20.409,12.141 -32.369,13.328 L 63.228,592.091 c -1.205,0.12 -3.07,0.28 -5.344,0.29 z M 76.905,321.486 c -14.193,0 -27.966,5.055 -38.784,14.233 -11.695,9.925 -19.024,23.849 -20.637,39.207 L 1.315,528.994 c -0.133,1.274 -0.312,3.249 -0.315,5.677 -0.017,15.137 5.869,29.375 16.572,40.092 10.705,10.717 24.936,16.618 40.072,16.618 h 0.181 l 0.057,0.5 -0.002,-0.5 c 2.231,-0.01 4.064,-0.167 5.249,-0.284 l 154.786,-15.373 c 11.763,-1.168 22.771,-5.7 31.835,-13.106 8.393,-6.858 14.768,-15.91 18.437,-26.175 3.668,-10.266 4.473,-21.308 2.328,-31.933 -2.317,-11.473 -7.96,-21.955 -16.319,-30.313 l -9.666,-9.666 220,-220.002 9.666,9.666 c 11.28,11.28 26.221,17.493 42.071,17.493 14.247,0 28.063,-5.09 38.902,-14.333 11.721,-9.998 19.021,-24.004 20.554,-39.44 L 591.098,63.109 c 0.116,-1.171 0.272,-2.987 0.282,-5.229 C 591.441,42.708 585.576,28.43 574.866,17.677 564.156,6.923 549.904,1 534.736,1 c -2.485,0.002 -4.468,0.181 -5.747,0.315 L 374.928,17.484 c -11.723,1.231 -22.682,5.805 -31.689,13.226 -8.347,6.877 -14.677,15.93 -18.306,26.179 -3.631,10.25 -4.41,21.268 -2.253,31.865 2.327,11.436 7.964,21.888 16.299,30.224 l 8.873,8.873 -220.001,220 -8.873,-8.872 C 107.697,327.698 92.756,321.486 76.905,321.486 Z M 57.706,549.541 c -4.013,0 -7.731,-1.544 -10.531,-4.347 -2.8,-2.803 -4.339,-6.523 -4.334,-10.476 0,-0.479 0.043,-0.954 0.086,-1.356 l 16.17,-154.066 c 0.955,-9.104 8.61,-15.969 17.807,-15.969 4.676,0 9.112,1.86 12.49,5.237 l 27.993,27.993 c 2.795,2.795 6.512,4.334 10.465,4.334 3.954,0 7.67,-1.539 10.466,-4.334 l 258.24,-258.242 c 2.796,-2.795 4.335,-6.512 4.335,-10.465 0,-3.953 -1.539,-7.67 -4.335,-10.465 L 368.566,89.392 c -4.9,-4.9 -6.507,-12.002 -4.192,-18.534 2.313,-6.532 8.032,-11.039 14.925,-11.763 L 533.365,42.926 c 0.429,-0.045 0.891,-0.086 1.356,-0.086 3.978,0 7.701,1.549 10.503,4.362 2.801,2.812 4.335,6.543 4.318,10.503 -0.002,0.424 -0.036,0.848 -0.079,1.269 L 534.088,213.78 c -1.036,10.436 -9.955,16.067 -17.82,16.067 -4.675,0 -9.109,-1.86 -12.486,-5.238 l -28.786,-28.786 c -2.795,-2.795 -6.512,-4.335 -10.465,-4.335 -3.953,0 -7.67,1.54 -10.466,4.335 l -258.24,258.241 c -2.795,2.796 -4.335,6.513 -4.335,10.466 0,3.953 1.54,7.67 4.335,10.465 l 28.786,28.786 c 4.916,4.915 6.516,12.034 4.177,18.58 -2.339,6.546 -8.089,11.039 -15.006,11.726 L 58.974,549.462 c -0.421,0.042 -0.845,0.077 -1.268,0.079 z M 76.903,364.327 c -7.383,0 -15.785,5.282 -16.812,15.072 L 43.92,533.466 c -0.039,0.377 -0.08,0.821 -0.08,1.255 -0.004,3.685 1.431,7.153 4.042,9.767 2.611,2.614 6.078,4.054 9.762,4.054 0.448,-0.002 0.841,-0.035 1.23,-0.074 l 154.807,-15.375 c 6.528,-0.648 11.956,-4.889 14.163,-11.066 2.208,-6.179 0.697,-12.898 -3.942,-17.537 l -28.786,-28.786 c -2.984,-2.984 -4.628,-6.951 -4.628,-11.172 0,-4.221 1.644,-8.188 4.628,-11.173 l 258.24,-258.241 c 2.984,-2.984 6.953,-4.628 11.173,-4.628 4.221,0 8.188,1.644 11.172,4.628 l 28.786,28.786 c 3.188,3.189 7.372,4.945 11.779,4.945 7.426,0 15.847,-5.315 16.826,-15.166 L 548.465,58.876 c 0.04,-0.391 0.072,-0.782 0.074,-1.174 0.015,-3.692 -1.415,-7.17 -4.027,-9.793 -2.612,-2.623 -6.084,-4.068 -9.776,-4.068 -0.438,0 -0.868,0.039 -1.271,0.081 L 379.4,60.091 c -6.505,0.683 -11.902,4.937 -14.086,11.102 -2.184,6.166 -0.668,12.869 3.957,17.494 l 27.992,27.993 c 2.984,2.984 4.628,6.952 4.628,11.172 0,4.22 -1.644,8.188 -4.628,11.172 l -258.24,258.242 c -2.984,2.983 -6.952,4.627 -11.173,4.627 -4.22,0 -8.188,-1.644 -11.172,-4.627 L 88.685,369.273 c -3.189,-3.188 -7.373,-4.944 -11.781,-4.944 h -10e-4 z"
    id="path2"
-   style="stroke:none;stroke-opacity:1;fill:none;fill-opacity:1" />
+   style="stroke:none;stroke-opacity:1;fill:none;fill-opacity:1" />&#10;<path
-<path
    id="path4"
    style="opacity:1;fill:none;fill-opacity:1;stroke:#dedede;stroke-width:11.4409;stroke-opacity:1"
    d="M 718.26172 61.451172 C 703.9302 61.673046 675.6509 64.795307 615.91602 71.085938 C 510.64105 82.172355 506.83976 82.696464 501.32812 86.900391 C 494.30291 92.258775 491.61693 100.68029 494.08398 109.61523 C 495.39397 114.35962 501.81636 122.06818 519.0332 139.56055 C 539.26418 160.1153 542.33536 163.97907 543.12695 169.88086 C 543.71145 174.23864 543.08828 178.42758 541.37695 181.65625 C 536.83605 190.22338 183.85485 541.58597 178.48242 542.88672 C 167.8646 545.45747 163.39191 542.80571 141.90625 521.20312 C 130.56778 509.80297 118.72927 498.87432 115.59961 496.91797 C 104.7133 490.11295 90.571438 493.62522 84.929688 504.53516 C 83.114513 508.04531 78.856125 542.14536 71.267578 613.95703 C 65.204342 671.33441 60.238469 720.48682 60.230469 723.18359 C 60.220739 726.47831 62.133907 730.00501 66.064453 733.93555 C 69.641193 737.51228 73.609656 739.78516 76.277344 739.78516 C 78.676873 739.78516 127.72113 735.15134 185.26562 729.48828 C 255.31689 722.59442 291.74456 718.33787 295.49609 716.60742 C 302.5317 713.36215 307.94317 704.67042 307.95117 696.60156 C 307.95954 688.55445 302.84481 681.74993 279.63281 658.92383 C 255.79542 635.48275 252.72283 629.44197 258.81055 617.97852 C 260.16747 615.42335 341.26413 533.44142 439.02539 435.79688 C 560.58716 314.38019 618.27419 257.89856 621.51758 257.11328 C 632.08815 254.55396 636.64319 257.22195 657.23633 278.03516 C 681.87956 302.94171 688.47995 307.95917 696.60156 307.95117 C 704.26914 307.94321 712.9933 302.81136 716.33984 296.33984 C 718.05425 293.02457 722.33051 256.45802 729.63477 182.67969 L 740.4043 73.908203 L 736.91602 69.212891 C 732.97628 63.90804 732.59323 61.229298 718.26172 61.451172 z "

src/libs/vmisc/share/resources/icon/svg/dark/expand1-hover.svg

@@ -10,22 +10,12 @@
    viewBox="0 0 592.381 592.381"
    xml:space="preserve"
    sodipodi:docname="expand1-hover.svg"
-   inkscape:version="1.3.2 (1:1.3.2+202311252150+091e20ef0f)"
+   inkscape:version="1.3 (1:1.3+202307231459+0e150ed6c4)"
-   inkscape:export-filename="expand1-hover@2x.png"
-   inkscape:export-xdpi="7.6799998"
-   inkscape:export-ydpi="7.6799998"
    xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
    xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
    xmlns="http://www.w3.org/2000/svg"
    xmlns:svg="http://www.w3.org/2000/svg"><defs
-   id="defs4">
+   id="defs4">&#10;	&#10;&#10;		&#10;	&#10;			&#10;			&#10;		</defs><sodipodi:namedview
-	
-
-		
-	
-			
-			
-		</defs><sodipodi:namedview
    id="namedview4"
    pagecolor="#ffffff"
    bordercolor="#666666"
@@ -37,20 +27,18 @@
    inkscape:zoom="0.58125"
    inkscape:cx="-197.84946"
    inkscape:cy="-111.82796"
-   inkscape:window-width="2560"
+   inkscape:window-width="1920"
-   inkscape:window-height="1372"
+   inkscape:window-height="1172"
-   inkscape:window-x="1920"
+   inkscape:window-x="0"
-   inkscape:window-y="0"
+   inkscape:window-y="240"
    inkscape:window-maximized="1"
-   inkscape:current-layer="Capa_1" />
+   inkscape:current-layer="Capa_1" />&#10;<path
-<path
    d="m 57.645,591.881 c 0.051,0 0.123,0 0.181,0 0.019,0 0.038,0 0.057,0 2.262,-0.01 4.106,-0.169 5.296,-0.287 l 154.786,-15.373 c 11.862,-1.178 22.962,-5.748 32.102,-13.217 8.463,-6.916 14.892,-16.042 18.591,-26.394 3.699,-10.352 4.51,-21.485 2.347,-32.199 -2.336,-11.569 -8.026,-22.14 -16.456,-30.568 l -9.312,-9.312 219.293,-219.295 9.312,9.312 c 11.374,11.375 26.441,17.639 42.425,17.639 14.367,0 28.298,-5.133 39.227,-14.453 11.819,-10.082 19.181,-24.206 20.727,-39.771 L 591.596,63.157 c 0.118,-1.186 0.275,-3.025 0.285,-5.276 C 591.943,42.574 586.027,28.172 575.222,17.323 564.416,6.475 550.038,0.5 534.736,0.5 h -0.017 c -0.011,0 -0.021,0 -0.033,0 -2.457,0.002 -4.459,0.183 -5.75,0.318 l -154.06,16.169 c -11.822,1.241 -22.872,5.854 -31.956,13.337 -8.415,6.934 -14.799,16.062 -18.459,26.398 -3.661,10.335 -4.446,21.446 -2.271,32.131 2.348,11.534 8.031,22.072 16.436,30.478 l 8.52,8.519 -219.295,219.294 -8.519,-8.519 c -11.375,-11.374 -26.441,-17.639 -42.426,-17.639 -14.311,0 -28.199,5.097 -39.107,14.353 -11.794,10.008 -19.185,24.049 -20.811,39.536 L 0.818,528.942 c -0.136,1.294 -0.314,3.285 -0.318,5.728 -0.017,15.271 5.92,29.635 16.719,40.446 10.798,10.811 25.155,16.765 40.426,16.765 z M 43.423,533.414 59.593,379.348 c 1.002,-9.553 9.017,-15.521 17.312,-15.521 4.278,0 8.631,1.588 12.134,5.091 l 27.993,27.993 c 2.988,2.987 6.903,4.48 10.819,4.48 3.916,0 7.832,-1.493 10.819,-4.48 L 396.91,138.669 c 5.976,-5.975 5.976,-15.662 0,-21.637 L 368.918,89.04 c -10.294,-10.294 -4.05,-27.926 10.431,-29.446 l 154.066,-16.17 c 0.434,-0.045 0.87,-0.083 1.306,-0.083 0.005,0 0.011,0 0.017,0 7.907,0 14.336,6.448 14.304,14.363 -0.002,0.408 -0.035,0.815 -0.076,1.221 l -15.374,154.807 c -0.954,9.602 -8.996,15.617 -17.323,15.617 -4.275,0 -8.629,-1.587 -12.133,-5.092 L 475.35,195.471 c -2.987,-2.988 -6.903,-4.481 -10.818,-4.481 -3.916,0 -7.831,1.494 -10.819,4.481 l -258.24,258.241 c -5.975,5.976 -5.975,15.663 0,21.638 l 28.786,28.786 c 10.327,10.326 4.007,28.012 -10.525,29.455 l -154.81,15.374 c -0.405,0.04 -0.813,0.074 -1.221,0.076 -0.02,0 -0.04,0 -0.059,0 -7.894,0 -14.313,-6.426 -14.304,-14.321 10e-4,-0.437 0.038,-0.872 0.083,-1.306 z"
    id="path1"
    style="fill:#dedede;fill-opacity:1;stroke:#dedede;stroke-opacity:1" /><path
    d="m 57.884,592.381 h -0.24 c -15.404,0 -29.886,-6.006 -40.78,-16.911 C 5.972,564.564 -0.017,550.074 0,534.669 c 0.003,-2.474 0.185,-4.482 0.321,-5.778 L 16.49,374.823 c 1.639,-15.616 9.091,-29.774 20.984,-39.865 10.998,-9.332 25.001,-14.472 39.431,-14.472 16.118,0 31.311,6.316 42.78,17.785 l 8.166,8.165 218.587,-218.586 -8.166,-8.166 c -8.475,-8.475 -14.205,-19.102 -16.572,-30.731 -2.192,-10.774 -1.4,-21.978 2.29,-32.398 3.69,-10.42 10.126,-19.624 18.612,-26.617 9.161,-7.547 20.303,-12.198 32.223,-13.449 L 528.885,0.321 c 1.301,-0.137 3.318,-0.319 5.802,-0.321 15.485,0 29.989,6.027 40.89,16.971 10.898,10.943 16.867,25.473 16.805,40.913 -0.01,2.285 -0.169,4.132 -0.287,5.324 L 576.72,218.014 c -1.56,15.694 -8.981,29.936 -20.9,40.102 -11.02,9.397 -25.065,14.572 -39.551,14.572 -16.117,0 -31.31,-6.316 -42.778,-17.786 l -8.959,-8.959 -218.589,218.587 8.959,8.959 c 8.499,8.498 14.236,19.156 16.592,30.823 2.181,10.803 1.363,22.029 -2.367,32.466 -3.73,10.437 -10.211,19.64 -18.745,26.612 -9.216,7.531 -20.409,12.141 -32.369,13.328 L 63.228,592.091 c -1.205,0.12 -3.07,0.28 -5.344,0.29 z M 76.905,321.486 c -14.193,0 -27.966,5.055 -38.784,14.233 -11.695,9.925 -19.024,23.849 -20.637,39.207 L 1.315,528.994 c -0.133,1.274 -0.312,3.249 -0.315,5.677 -0.017,15.137 5.869,29.375 16.572,40.092 10.705,10.717 24.936,16.618 40.072,16.618 h 0.181 l 0.057,0.5 -0.002,-0.5 c 2.231,-0.01 4.064,-0.167 5.249,-0.284 l 154.786,-15.373 c 11.763,-1.168 22.771,-5.7 31.835,-13.106 8.393,-6.858 14.768,-15.91 18.437,-26.175 3.668,-10.266 4.473,-21.308 2.328,-31.933 -2.317,-11.473 -7.96,-21.955 -16.319,-30.313 l -9.666,-9.666 220,-220.002 9.666,9.666 c 11.28,11.28 26.221,17.493 42.071,17.493 14.247,0 28.063,-5.09 38.902,-14.333 11.721,-9.998 19.021,-24.004 20.554,-39.44 L 591.098,63.109 c 0.116,-1.171 0.272,-2.987 0.282,-5.229 C 591.441,42.708 585.576,28.43 574.866,17.677 564.156,6.923 549.904,1 534.736,1 c -2.485,0.002 -4.468,0.181 -5.747,0.315 L 374.928,17.484 c -11.723,1.231 -22.682,5.805 -31.689,13.226 -8.347,6.877 -14.677,15.93 -18.306,26.179 -3.631,10.25 -4.41,21.268 -2.253,31.865 2.327,11.436 7.964,21.888 16.299,30.224 l 8.873,8.873 -220.001,220 -8.873,-8.872 C 107.697,327.698 92.756,321.486 76.905,321.486 Z M 57.706,549.541 c -4.013,0 -7.731,-1.544 -10.531,-4.347 -2.8,-2.803 -4.339,-6.523 -4.334,-10.476 0,-0.479 0.043,-0.954 0.086,-1.356 l 16.17,-154.066 c 0.955,-9.104 8.61,-15.969 17.807,-15.969 4.676,0 9.112,1.86 12.49,5.237 l 27.993,27.993 c 2.795,2.795 6.512,4.334 10.465,4.334 3.954,0 7.67,-1.539 10.466,-4.334 l 258.24,-258.242 c 2.796,-2.795 4.335,-6.512 4.335,-10.465 0,-3.953 -1.539,-7.67 -4.335,-10.465 L 368.566,89.392 c -4.9,-4.9 -6.507,-12.002 -4.192,-18.534 2.313,-6.532 8.032,-11.039 14.925,-11.763 L 533.365,42.926 c 0.429,-0.045 0.891,-0.086 1.356,-0.086 3.978,0 7.701,1.549 10.503,4.362 2.801,2.812 4.335,6.543 4.318,10.503 -0.002,0.424 -0.036,0.848 -0.079,1.269 L 534.088,213.78 c -1.036,10.436 -9.955,16.067 -17.82,16.067 -4.675,0 -9.109,-1.86 -12.486,-5.238 l -28.786,-28.786 c -2.795,-2.795 -6.512,-4.335 -10.465,-4.335 -3.953,0 -7.67,1.54 -10.466,4.335 l -258.24,258.241 c -2.795,2.796 -4.335,6.513 -4.335,10.466 0,3.953 1.54,7.67 4.335,10.465 l 28.786,28.786 c 4.916,4.915 6.516,12.034 4.177,18.58 -2.339,6.546 -8.089,11.039 -15.006,11.726 L 58.974,549.462 c -0.421,0.042 -0.845,0.077 -1.268,0.079 z M 76.903,364.327 c -7.383,0 -15.785,5.282 -16.812,15.072 L 43.92,533.466 c -0.039,0.377 -0.08,0.821 -0.08,1.255 -0.004,3.685 1.431,7.153 4.042,9.767 2.611,2.614 6.078,4.054 9.762,4.054 0.448,-0.002 0.841,-0.035 1.23,-0.074 l 154.807,-15.375 c 6.528,-0.648 11.956,-4.889 14.163,-11.066 2.208,-6.179 0.697,-12.898 -3.942,-17.537 l -28.786,-28.786 c -2.984,-2.984 -4.628,-6.951 -4.628,-11.172 0,-4.221 1.644,-8.188 4.628,-11.173 l 258.24,-258.241 c 2.984,-2.984 6.953,-4.628 11.173,-4.628 4.221,0 8.188,1.644 11.172,4.628 l 28.786,28.786 c 3.188,3.189 7.372,4.945 11.779,4.945 7.426,0 15.847,-5.315 16.826,-15.166 L 548.465,58.876 c 0.04,-0.391 0.072,-0.782 0.074,-1.174 0.015,-3.692 -1.415,-7.17 -4.027,-9.793 -2.612,-2.623 -6.084,-4.068 -9.776,-4.068 -0.438,0 -0.868,0.039 -1.271,0.081 L 379.4,60.091 c -6.505,0.683 -11.902,4.937 -14.086,11.102 -2.184,6.166 -0.668,12.869 3.957,17.494 l 27.992,27.993 c 2.984,2.984 4.628,6.952 4.628,11.172 0,4.22 -1.644,8.188 -4.628,11.172 l -258.24,258.242 c -2.984,2.983 -6.952,4.627 -11.173,4.627 -4.22,0 -8.188,-1.644 -11.172,-4.627 L 88.685,369.273 c -3.189,-3.188 -7.373,-4.944 -11.781,-4.944 h -10e-4 z"
    id="path2"
-   style="stroke:#dedede;stroke-opacity:1" />
+   style="stroke:#dedede;stroke-opacity:1" />&#10;<path
-<path
    id="path4"
    style="opacity:1;fill:#7ed63e;fill-opacity:1;stroke:#7ed63e;stroke-width:11.4409;stroke-opacity:1"
    d="M 718.26172 61.451172 C 703.9302 61.673046 675.6509 64.795307 615.91602 71.085938 C 510.64105 82.172355 506.83976 82.696464 501.32812 86.900391 C 494.30291 92.258775 491.61693 100.68029 494.08398 109.61523 C 495.39397 114.35962 501.81636 122.06818 519.0332 139.56055 C 539.26418 160.1153 542.33536 163.97907 543.12695 169.88086 C 543.71145 174.23864 543.08828 178.42758 541.37695 181.65625 C 536.83605 190.22338 183.85485 541.58597 178.48242 542.88672 C 167.8646 545.45747 163.39191 542.80571 141.90625 521.20312 C 130.56778 509.80297 118.72927 498.87432 115.59961 496.91797 C 104.7133 490.11295 90.571438 493.62522 84.929688 504.53516 C 83.114513 508.04531 78.856125 542.14536 71.267578 613.95703 C 65.204342 671.33441 60.238469 720.48682 60.230469 723.18359 C 60.220739 726.47831 62.133907 730.00501 66.064453 733.93555 C 69.641193 737.51228 73.609656 739.78516 76.277344 739.78516 C 78.676873 739.78516 127.72113 735.15134 185.26562 729.48828 C 255.31689 722.59442 291.74456 718.33787 295.49609 716.60742 C 302.5317 713.36215 307.94317 704.67042 307.95117 696.60156 C 307.95954 688.55445 302.84481 681.74993 279.63281 658.92383 C 255.79542 635.48275 252.72283 629.44197 258.81055 617.97852 C 260.16747 615.42335 341.26413 533.44142 439.02539 435.79688 C 560.58716 314.38019 618.27419 257.89856 621.51758 257.11328 C 632.08815 254.55396 636.64319 257.22195 657.23633 278.03516 C 681.87956 302.94171 688.47995 307.95917 696.60156 307.95117 C 704.26914 307.94321 712.9933 302.81136 716.33984 296.33984 C 718.05425 293.02457 722.33051 256.45802 729.63477 182.67969 L 740.4043 73.908203 L 736.91602 69.212891 C 732.97628 63.90804 732.59323 61.229298 718.26172 61.451172 z "

src/libs/vmisc/share/resources/icon/svg/dark/expand1.svg

@@ -10,22 +10,12 @@
    viewBox="0 0 592.381 592.381"
    xml:space="preserve"
    sodipodi:docname="expand1.svg"
-   inkscape:version="1.3.2 (1:1.3.2+202311252150+091e20ef0f)"
+   inkscape:version="1.3 (1:1.3+202307231459+0e150ed6c4)"
-   inkscape:export-filename="expand1@2x.png"
-   inkscape:export-xdpi="7.6799998"
-   inkscape:export-ydpi="7.6799998"
    xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
    xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
    xmlns="http://www.w3.org/2000/svg"
    xmlns:svg="http://www.w3.org/2000/svg"><defs
-   id="defs4">
+   id="defs4">&#10;	&#10;&#10;		&#10;	&#10;			&#10;			&#10;		</defs><sodipodi:namedview
-	
-
-		
-	
-			
-			
-		</defs><sodipodi:namedview
    id="namedview4"
    pagecolor="#ffffff"
    bordercolor="#666666"
@@ -37,20 +27,18 @@
    inkscape:zoom="0.58125"
    inkscape:cx="190.96774"
    inkscape:cy="295.91398"
-   inkscape:window-width="2560"
+   inkscape:window-width="1920"
-   inkscape:window-height="1372"
+   inkscape:window-height="1172"
-   inkscape:window-x="1920"
+   inkscape:window-x="0"
-   inkscape:window-y="0"
+   inkscape:window-y="240"
    inkscape:window-maximized="1"
-   inkscape:current-layer="Capa_1" />
+   inkscape:current-layer="Capa_1" />&#10;<path
-<path
    d="m 57.645,591.881 c 0.051,0 0.123,0 0.181,0 0.019,0 0.038,0 0.057,0 2.262,-0.01 4.106,-0.169 5.296,-0.287 l 154.786,-15.373 c 11.862,-1.178 22.962,-5.748 32.102,-13.217 8.463,-6.916 14.892,-16.042 18.591,-26.394 3.699,-10.352 4.51,-21.485 2.347,-32.199 -2.336,-11.569 -8.026,-22.14 -16.456,-30.568 l -9.312,-9.312 219.293,-219.295 9.312,9.312 c 11.374,11.375 26.441,17.639 42.425,17.639 14.367,0 28.298,-5.133 39.227,-14.453 11.819,-10.082 19.181,-24.206 20.727,-39.771 L 591.596,63.157 c 0.118,-1.186 0.275,-3.025 0.285,-5.276 C 591.943,42.574 586.027,28.172 575.222,17.323 564.416,6.475 550.038,0.5 534.736,0.5 h -0.017 c -0.011,0 -0.021,0 -0.033,0 -2.457,0.002 -4.459,0.183 -5.75,0.318 l -154.06,16.169 c -11.822,1.241 -22.872,5.854 -31.956,13.337 -8.415,6.934 -14.799,16.062 -18.459,26.398 -3.661,10.335 -4.446,21.446 -2.271,32.131 2.348,11.534 8.031,22.072 16.436,30.478 l 8.52,8.519 -219.295,219.294 -8.519,-8.519 c -11.375,-11.374 -26.441,-17.639 -42.426,-17.639 -14.311,0 -28.199,5.097 -39.107,14.353 -11.794,10.008 -19.185,24.049 -20.811,39.536 L 0.818,528.942 c -0.136,1.294 -0.314,3.285 -0.318,5.728 -0.017,15.271 5.92,29.635 16.719,40.446 10.798,10.811 25.155,16.765 40.426,16.765 z M 43.423,533.414 59.593,379.348 c 1.002,-9.553 9.017,-15.521 17.312,-15.521 4.278,0 8.631,1.588 12.134,5.091 l 27.993,27.993 c 2.988,2.987 6.903,4.48 10.819,4.48 3.916,0 7.832,-1.493 10.819,-4.48 L 396.91,138.669 c 5.976,-5.975 5.976,-15.662 0,-21.637 L 368.918,89.04 c -10.294,-10.294 -4.05,-27.926 10.431,-29.446 l 154.066,-16.17 c 0.434,-0.045 0.87,-0.083 1.306,-0.083 0.005,0 0.011,0 0.017,0 7.907,0 14.336,6.448 14.304,14.363 -0.002,0.408 -0.035,0.815 -0.076,1.221 l -15.374,154.807 c -0.954,9.602 -8.996,15.617 -17.323,15.617 -4.275,0 -8.629,-1.587 -12.133,-5.092 L 475.35,195.471 c -2.987,-2.988 -6.903,-4.481 -10.818,-4.481 -3.916,0 -7.831,1.494 -10.819,4.481 l -258.24,258.241 c -5.975,5.976 -5.975,15.663 0,21.638 l 28.786,28.786 c 10.327,10.326 4.007,28.012 -10.525,29.455 l -154.81,15.374 c -0.405,0.04 -0.813,0.074 -1.221,0.076 -0.02,0 -0.04,0 -0.059,0 -7.894,0 -14.313,-6.426 -14.304,-14.321 10e-4,-0.437 0.038,-0.872 0.083,-1.306 z"
    id="path1"
    style="fill:#dedede;fill-opacity:1;stroke:#dedede;stroke-opacity:1" /><path
    d="m 57.884,592.381 h -0.24 c -15.404,0 -29.886,-6.006 -40.78,-16.911 C 5.972,564.564 -0.017,550.074 0,534.669 c 0.003,-2.474 0.185,-4.482 0.321,-5.778 L 16.49,374.823 c 1.639,-15.616 9.091,-29.774 20.984,-39.865 10.998,-9.332 25.001,-14.472 39.431,-14.472 16.118,0 31.311,6.316 42.78,17.785 l 8.166,8.165 218.587,-218.586 -8.166,-8.166 c -8.475,-8.475 -14.205,-19.102 -16.572,-30.731 -2.192,-10.774 -1.4,-21.978 2.29,-32.398 3.69,-10.42 10.126,-19.624 18.612,-26.617 9.161,-7.547 20.303,-12.198 32.223,-13.449 L 528.885,0.321 c 1.301,-0.137 3.318,-0.319 5.802,-0.321 15.485,0 29.989,6.027 40.89,16.971 10.898,10.943 16.867,25.473 16.805,40.913 -0.01,2.285 -0.169,4.132 -0.287,5.324 L 576.72,218.014 c -1.56,15.694 -8.981,29.936 -20.9,40.102 -11.02,9.397 -25.065,14.572 -39.551,14.572 -16.117,0 -31.31,-6.316 -42.778,-17.786 l -8.959,-8.959 -218.589,218.587 8.959,8.959 c 8.499,8.498 14.236,19.156 16.592,30.823 2.181,10.803 1.363,22.029 -2.367,32.466 -3.73,10.437 -10.211,19.64 -18.745,26.612 -9.216,7.531 -20.409,12.141 -32.369,13.328 L 63.228,592.091 c -1.205,0.12 -3.07,0.28 -5.344,0.29 z M 76.905,321.486 c -14.193,0 -27.966,5.055 -38.784,14.233 -11.695,9.925 -19.024,23.849 -20.637,39.207 L 1.315,528.994 c -0.133,1.274 -0.312,3.249 -0.315,5.677 -0.017,15.137 5.869,29.375 16.572,40.092 10.705,10.717 24.936,16.618 40.072,16.618 h 0.181 l 0.057,0.5 -0.002,-0.5 c 2.231,-0.01 4.064,-0.167 5.249,-0.284 l 154.786,-15.373 c 11.763,-1.168 22.771,-5.7 31.835,-13.106 8.393,-6.858 14.768,-15.91 18.437,-26.175 3.668,-10.266 4.473,-21.308 2.328,-31.933 -2.317,-11.473 -7.96,-21.955 -16.319,-30.313 l -9.666,-9.666 220,-220.002 9.666,9.666 c 11.28,11.28 26.221,17.493 42.071,17.493 14.247,0 28.063,-5.09 38.902,-14.333 11.721,-9.998 19.021,-24.004 20.554,-39.44 L 591.098,63.109 c 0.116,-1.171 0.272,-2.987 0.282,-5.229 C 591.441,42.708 585.576,28.43 574.866,17.677 564.156,6.923 549.904,1 534.736,1 c -2.485,0.002 -4.468,0.181 -5.747,0.315 L 374.928,17.484 c -11.723,1.231 -22.682,5.805 -31.689,13.226 -8.347,6.877 -14.677,15.93 -18.306,26.179 -3.631,10.25 -4.41,21.268 -2.253,31.865 2.327,11.436 7.964,21.888 16.299,30.224 l 8.873,8.873 -220.001,220 -8.873,-8.872 C 107.697,327.698 92.756,321.486 76.905,321.486 Z M 57.706,549.541 c -4.013,0 -7.731,-1.544 -10.531,-4.347 -2.8,-2.803 -4.339,-6.523 -4.334,-10.476 0,-0.479 0.043,-0.954 0.086,-1.356 l 16.17,-154.066 c 0.955,-9.104 8.61,-15.969 17.807,-15.969 4.676,0 9.112,1.86 12.49,5.237 l 27.993,27.993 c 2.795,2.795 6.512,4.334 10.465,4.334 3.954,0 7.67,-1.539 10.466,-4.334 l 258.24,-258.242 c 2.796,-2.795 4.335,-6.512 4.335,-10.465 0,-3.953 -1.539,-7.67 -4.335,-10.465 L 368.566,89.392 c -4.9,-4.9 -6.507,-12.002 -4.192,-18.534 2.313,-6.532 8.032,-11.039 14.925,-11.763 L 533.365,42.926 c 0.429,-0.045 0.891,-0.086 1.356,-0.086 3.978,0 7.701,1.549 10.503,4.362 2.801,2.812 4.335,6.543 4.318,10.503 -0.002,0.424 -0.036,0.848 -0.079,1.269 L 534.088,213.78 c -1.036,10.436 -9.955,16.067 -17.82,16.067 -4.675,0 -9.109,-1.86 -12.486,-5.238 l -28.786,-28.786 c -2.795,-2.795 -6.512,-4.335 -10.465,-4.335 -3.953,0 -7.67,1.54 -10.466,4.335 l -258.24,258.241 c -2.795,2.796 -4.335,6.513 -4.335,10.466 0,3.953 1.54,7.67 4.335,10.465 l 28.786,28.786 c 4.916,4.915 6.516,12.034 4.177,18.58 -2.339,6.546 -8.089,11.039 -15.006,11.726 L 58.974,549.462 c -0.421,0.042 -0.845,0.077 -1.268,0.079 z M 76.903,364.327 c -7.383,0 -15.785,5.282 -16.812,15.072 L 43.92,533.466 c -0.039,0.377 -0.08,0.821 -0.08,1.255 -0.004,3.685 1.431,7.153 4.042,9.767 2.611,2.614 6.078,4.054 9.762,4.054 0.448,-0.002 0.841,-0.035 1.23,-0.074 l 154.807,-15.375 c 6.528,-0.648 11.956,-4.889 14.163,-11.066 2.208,-6.179 0.697,-12.898 -3.942,-17.537 l -28.786,-28.786 c -2.984,-2.984 -4.628,-6.951 -4.628,-11.172 0,-4.221 1.644,-8.188 4.628,-11.173 l 258.24,-258.241 c 2.984,-2.984 6.953,-4.628 11.173,-4.628 4.221,0 8.188,1.644 11.172,4.628 l 28.786,28.786 c 3.188,3.189 7.372,4.945 11.779,4.945 7.426,0 15.847,-5.315 16.826,-15.166 L 548.465,58.876 c 0.04,-0.391 0.072,-0.782 0.074,-1.174 0.015,-3.692 -1.415,-7.17 -4.027,-9.793 -2.612,-2.623 -6.084,-4.068 -9.776,-4.068 -0.438,0 -0.868,0.039 -1.271,0.081 L 379.4,60.091 c -6.505,0.683 -11.902,4.937 -14.086,11.102 -2.184,6.166 -0.668,12.869 3.957,17.494 l 27.992,27.993 c 2.984,2.984 4.628,6.952 4.628,11.172 0,4.22 -1.644,8.188 -4.628,11.172 l -258.24,258.242 c -2.984,2.983 -6.952,4.627 -11.173,4.627 -4.22,0 -8.188,-1.644 -11.172,-4.627 L 88.685,369.273 c -3.189,-3.188 -7.373,-4.944 -11.781,-4.944 h -10e-4 z"
    id="path2"
-   style="stroke:#dedede;stroke-opacity:1;fill:#dedede;fill-opacity:1" />
+   style="stroke:#dedede;stroke-opacity:1;fill:#dedede;fill-opacity:1" />&#10;<path
-<path
    id="path4"
    style="opacity:1;fill:#dedede;fill-opacity:1;stroke:#dedede;stroke-width:11.4409;stroke-opacity:1"
    d="M 718.26172 61.451172 C 703.9302 61.673046 675.6509 64.795307 615.91602 71.085938 C 510.64105 82.172355 506.83976 82.696464 501.32812 86.900391 C 494.30291 92.258775 491.61693 100.68029 494.08398 109.61523 C 495.39397 114.35962 501.81636 122.06818 519.0332 139.56055 C 539.26418 160.1153 542.33536 163.97907 543.12695 169.88086 C 543.71145 174.23864 543.08828 178.42758 541.37695 181.65625 C 536.83605 190.22338 183.85485 541.58597 178.48242 542.88672 C 167.8646 545.45747 163.39191 542.80571 141.90625 521.20312 C 130.56778 509.80297 118.72927 498.87432 115.59961 496.91797 C 104.7133 490.11295 90.571438 493.62522 84.929688 504.53516 C 83.114513 508.04531 78.856125 542.14536 71.267578 613.95703 C 65.204342 671.33441 60.238469 720.48682 60.230469 723.18359 C 60.220739 726.47831 62.133907 730.00501 66.064453 733.93555 C 69.641193 737.51228 73.609656 739.78516 76.277344 739.78516 C 78.676873 739.78516 127.72113 735.15134 185.26562 729.48828 C 255.31689 722.59442 291.74456 718.33787 295.49609 716.60742 C 302.5317 713.36215 307.94317 704.67042 307.95117 696.60156 C 307.95954 688.55445 302.84481 681.74993 279.63281 658.92383 C 255.79542 635.48275 252.72283 629.44197 258.81055 617.97852 C 260.16747 615.42335 341.26413 533.44142 439.02539 435.79688 C 560.58716 314.38019 618.27419 257.89856 621.51758 257.11328 C 632.08815 254.55396 636.64319 257.22195 657.23633 278.03516 C 681.87956 302.94171 688.47995 307.95917 696.60156 307.95117 C 704.26914 307.94321 712.9933 302.81136 716.33984 296.33984 C 718.05425 293.02457 722.33051 256.45802 729.63477 182.67969 L 740.4043 73.908203 L 736.91602 69.212891 C 732.97628 63.90804 732.59323 61.229298 718.26172 61.451172 z "

src/libs/vmisc/theme/vtheme.cpp

@@ -527,7 +527,7 @@ auto VTheme::GetIconResource(const QString &root, const QString &iconName) -> QI
 //---------------------------------------------------------------------------------------------------------------------
 auto VTheme::GetPixmapResource(const QString &root, const QString &iconName) -> QPixmap
 {
-    bool const dark = (ColorSheme() == VColorSheme::Dark);
+    bool dark = (ColorSheme() == VColorSheme::Dark);
     return ::GetPixmapResource(root, iconName, dark);
 }
 

src/libs/vwidgets/fancytabbar/stylehelper.cpp

@@ -29,15 +29,16 @@
 
 #include "stylehelper.h"
 
-#include <QApplication>
-#include <QObject>
-#include <QPainter>
-#include <QPalette>
 #include <QPixmapCache>
-#include <QRect>
-#include <QStyleOption>
 #include <QWidget>
-#include <QtMath>
+#include <QRect>
+#include <QPainter>
+#include <QApplication>
+#include <QPalette>
+#include <QStyleOption>
+#include <QObject>
+
+#include "../vmisc/vmath.h"
 
 //---------------------------------------------------------------------------------------------------------------------
 auto StyleHelper::sidebarFontSize() -> qreal
@@ -81,7 +82,9 @@ auto StyleHelper::baseColor(bool lightColored) -> QColor
 auto StyleHelper::borderColor(bool lightColored) -> QColor
 {
     QColor result = baseColor(lightColored);
-    result.setHsv(result.hue(), result.saturation(), result.value() / 2);
+    result.setHsv(result.hue(),
+                  result.saturation(),
+                  result.value() / 2);
     return result;
 }
 
@@ -100,7 +103,9 @@ void StyleHelper::setBaseColor(const QColor &newcolor)
     m_requestedBaseColor = newcolor;
 
     QColor color;
-    color.setHsv(newcolor.hue(), static_cast<int>(newcolor.saturation() * 0.7), 64 + newcolor.value() / 3);
+    color.setHsv(newcolor.hue(),
+                 static_cast<int>(newcolor.saturation() * 0.7),
+                 64 + newcolor.value() / 3);
 
     if (color.isValid() && color != m_baseColor)
     {