Merge branch 'develop' into remove-union-tool-delete-option

FashionFreedom · Nov 19, 2024 · 12fc21d · 12fc21d
2 parents c761a23 + 2032630
commit 12fc21d
Show file tree

Hide file tree

Showing 15 changed files with 288 additions and 309 deletions.
diff --git a/src/app/seamly2d/dialogs/dialogpreferences.ui b/src/app/seamly2d/dialogs/dialogpreferences.ui
@@ -129,6 +129,9 @@
          <iconset resource="../../../libs/vmisc/share/resources/icon.qrc">
           <normaloff>:/icon/graphics_view_config.png</normaloff>:/icon/graphics_view_config.png</iconset>
         </property>
+        <property name="flags">
+         <set>ItemIsSelectable|ItemIsUserCheckable|ItemIsEnabled</set>
+        </property>
        </item>
       </widget>
      </item>
@@ -179,8 +182,8 @@
   </layout>
  </widget>
  <resources>
-  <include location="../../../libs/vmisc/share/resources/theme.qrc"/>
   <include location="../../../libs/vmisc/share/resources/icon.qrc"/>
+  <include location="../../../libs/vmisc/share/resources/theme.qrc"/>
  </resources>
  <connections>
   <connection>

diff --git a/src/app/seamly2d/dialogs/pieces_widget.cpp b/src/app/seamly2d/dialogs/pieces_widget.cpp
@@ -346,8 +346,6 @@ void PiecesWidget::cellDoubleClicked(int row, int column)
 void PiecesWidget::fillTable(const QHash<quint32, VPiece> *pieces)
 {
     ui->tableWidget->blockSignals(true);
-
-    const int selectedRow = ui->tableWidget->currentRow();
     ui->tableWidget->clearContents();
     ui->tableWidget->setColumnCount(5);
     ui->tableWidget->setRowCount(pieces->size());
@@ -425,9 +423,7 @@ void PiecesWidget::fillTable(const QHash<quint32, VPiece> *pieces)
     ui->tableWidget->horizontalHeader()->setSectionResizeMode(QHeaderView::Fixed);
     ui->tableWidget->resizeColumnsToContents();
     ui->tableWidget->resizeRowsToContents();
-    //ui->tableWidget->setCurrentCell(selectedRow, 0);
     ui->tableWidget->setSortingEnabled(true);
-    //ui->tableWidget->clearSelection();
     ui->tableWidget->blockSignals(false);
 }
 

diff --git a/src/app/seamly2d/dialogs/welcome_dialog.cpp b/src/app/seamly2d/dialogs/welcome_dialog.cpp
@@ -44,7 +44,7 @@ SeamlyWelcomeDialog::SeamlyWelcomeDialog(QWidget *parent)
     setWindowFlags(windowFlags() & ~Qt::WindowContextHelpButtonHint);
 
     //-------------------- Units setup
-    initUnits(MeasurementsType::Individual);
+    initUnits();
 
     //-------------------- Decimal separator setup
     ui->separator_CheckBox->setText(tr("User locale") + QString(" (%1)").arg(QLocale().decimalPoint()));
@@ -112,7 +112,7 @@ void SeamlyWelcomeDialog::apply()
 
 //---------------------------------------------------------------------------------------------------------------------
 // @brief changeEvent handle event changes
-// @param type event type
+//---------------------------------------------------------------------------------------------------------------------
 void SeamlyWelcomeDialog::changeEvent(QEvent *event)
 {
     if (event->type() == QEvent::LanguageChange)
@@ -135,11 +135,10 @@ void SeamlyWelcomeDialog::seperatorChanged()
     ui->separator_CheckBox->setText(tr("User locale") + QString(" (%1)").arg(seperator));
 }
 
-
 //---------------------------------------------------------------------------------------------------------------------
 // @brief initUnits initinailize the units combobox
-// @param type measurment type
-void SeamlyWelcomeDialog::initUnits(const MeasurementsType &type)
+//---------------------------------------------------------------------------------------------------------------------
+void SeamlyWelcomeDialog::initUnits()
 {
     ui->units_ComboBox->addItem(tr("Centimeters"), unitCM);
     ui->units_ComboBox->addItem(tr("Millimeters"), unitMM);

diff --git a/src/app/seamly2d/dialogs/welcome_dialog.h b/src/app/seamly2d/dialogs/welcome_dialog.h
@@ -55,7 +55,7 @@ class SeamlyWelcomeDialog : public QDialog
     bool                       m_selectionSoundChanged;
     VSettings                 *settings;
 
-    void                       initUnits(const MeasurementsType &type);
+    void                       initUnits();
 };
 
 #endif // WELCOME_DIALOG_H
diff --git a/src/app/seamly2d/mainwindow.h b/src/app/seamly2d/mainwindow.h
@@ -88,10 +88,6 @@ class LayoutToolBox;
 class QToolButton;
 class QDoubleSpinBox;
 class QFontComboBox;
-
-class DraftImage;
-class ImageItem;
-
 class MouseCoordinates;
 class PenToolBar;
 

diff --git a/src/app/seamlyme/dialogs/me_welcome_dialog.cpp b/src/app/seamlyme/dialogs/me_welcome_dialog.cpp
@@ -44,7 +44,7 @@ SeamlyMeWelcomeDialog::SeamlyMeWelcomeDialog(QWidget *parent)
     setWindowFlags(windowFlags() & ~Qt::WindowContextHelpButtonHint);
 
     //-------------------- Units setup
-    initUnits(MeasurementsType::Individual);
+    initUnits();
 
     //-------------------- Decimal separator setup
     ui->separator_CheckBox->setText(tr("User locale") + QString(" (%1)").arg(QLocale().decimalPoint()));
@@ -119,8 +119,8 @@ void SeamlyMeWelcomeDialog::seperatorChanged()
 
 //---------------------------------------------------------------------------------------------------------------------
 // @brief initUnits initinailize the units combobox
-// @param type measurment type
-void SeamlyMeWelcomeDialog::initUnits(const MeasurementsType &type)
+//---------------------------------------------------------------------------------------------------------------------
+void SeamlyMeWelcomeDialog::initUnits()
 {
     ui->units_ComboBox->addItem(tr("Centimeters"), unitCM);
     ui->units_ComboBox->addItem(tr("Millimeters"), unitMM);

diff --git a/src/app/seamlyme/dialogs/me_welcome_dialog.h b/src/app/seamlyme/dialogs/me_welcome_dialog.h
@@ -54,7 +54,7 @@ class SeamlyMeWelcomeDialog : public QDialog
     bool                       m_langChanged;
     VSeamlyMeSettings         *settings;
 
-    void                       initUnits(const MeasurementsType &type);
+    void                       initUnits();
 };
 
 #endif // ME_WELCOME_DIALOG_H
diff --git a/src/libs/tools/tools.pro b/src/libs/tools/tools.pro
@@ -46,9 +46,6 @@ OBJECTS_DIR = obj
 # Directory for files created uic
 UI_DIR = uic
 
-# Set using ccache. Function enable_ccache() defined in common.pri.
-$$enable_ccache()
-
 INCLUDEPATH += $$PWD/../vpatterndb
 
 include(warnings.pri)

diff --git a/src/libs/vmisc/share/resources/icon.qrc b/src/libs/vmisc/share/resources/icon.qrc
@@ -145,8 +145,6 @@
         <file>icon/160x64/properties.png</file>
         <file>icon/160x64/seam_allowance.png</file>
         <file>icon/32x32/color_picker.png</file>
-        <file>icon/32x32/lock_off.png</file>
-        <file>icon/32x32/lock_on.png</file>
         <file>icon/32x32/checkmark.png</file>
         <file>icon/32x32/[email protected]</file>
         <file>icon/64x64/rotation.png</file>