bug: Fix zoom shortcuts (#1182)

* fix zoom shortcuts * lupdate --------- Signed-off-by: DSCaskey <[email protected]>
FashionFreedom · Aug 26, 2024 · d8fec84 · d8fec84
1 parent bcabcc1
commit d8fec84
Show file tree

Hide file tree

Showing 22 changed files with 473 additions and 4,503 deletions.
diff --git a/share/translations/seamly2d_cs_CZ.ts b/share/translations/seamly2d_cs_CZ.ts
diff --git a/share/translations/seamly2d_de_DE.ts b/share/translations/seamly2d_de_DE.ts
diff --git a/share/translations/seamly2d_el_GR.ts b/share/translations/seamly2d_el_GR.ts
diff --git a/share/translations/seamly2d_en_CA.ts b/share/translations/seamly2d_en_CA.ts
diff --git a/share/translations/seamly2d_en_GB.ts b/share/translations/seamly2d_en_GB.ts
diff --git a/share/translations/seamly2d_en_IN.ts b/share/translations/seamly2d_en_IN.ts
diff --git a/share/translations/seamly2d_en_US.ts b/share/translations/seamly2d_en_US.ts
diff --git a/share/translations/seamly2d_es_ES.ts b/share/translations/seamly2d_es_ES.ts
diff --git a/share/translations/seamly2d_fi_FI.ts b/share/translations/seamly2d_fi_FI.ts
diff --git a/share/translations/seamly2d_fr_FR.ts b/share/translations/seamly2d_fr_FR.ts
diff --git a/share/translations/seamly2d_he_IL.ts b/share/translations/seamly2d_he_IL.ts
diff --git a/share/translations/seamly2d_id_ID.ts b/share/translations/seamly2d_id_ID.ts
diff --git a/share/translations/seamly2d_it_IT.ts b/share/translations/seamly2d_it_IT.ts
diff --git a/share/translations/seamly2d_nl_NL.ts b/share/translations/seamly2d_nl_NL.ts
diff --git a/share/translations/seamly2d_pt_BR.ts b/share/translations/seamly2d_pt_BR.ts
diff --git a/share/translations/seamly2d_ro_RO.ts b/share/translations/seamly2d_ro_RO.ts
diff --git a/share/translations/seamly2d_ru_RU.ts b/share/translations/seamly2d_ru_RU.ts
diff --git a/share/translations/seamly2d_uk_UA.ts b/share/translations/seamly2d_uk_UA.ts
diff --git a/share/translations/seamly2d_zh_CN.ts b/share/translations/seamly2d_zh_CN.ts
diff --git a/src/app/seamly2d/dialogs/shortcuts_dialog.cpp b/src/app/seamly2d/dialogs/shortcuts_dialog.cpp
diff --git a/src/app/seamly2d/mainwindow.cpp b/src/app/seamly2d/mainwindow.cpp
@@ -2548,7 +2548,7 @@ void MainWindow::initializeToolsToolBar()
     connect(ui->zoom100Percent_Action, &QAction::triggered, ui->view, &VMainGraphicsView::zoom100Percent);
 
     QList<QKeySequence> zoomToFitShortcuts;
-    zoomToFitShortcuts.append(QKeySequence(Qt::ControlModifier + Qt::Key_Equal));
+    zoomToFitShortcuts.append(QKeySequence(Qt::ControlModifier + Qt::Key_9));
     ui->zoomToFit_Action->setShortcuts(zoomToFitShortcuts);
     connect(ui->zoomToFit_Action, &QAction::triggered, ui->view, &VMainGraphicsView::zoomToFit);
 
@@ -2592,7 +2592,7 @@ void MainWindow::initializeToolsToolBar()
     zoomScaleSpinBox = new QDoubleSpinBox();
     zoomScaleSpinBox->setDecimals(1);
     zoomScaleSpinBox->setAlignment(Qt::AlignRight);
-    zoomScaleSpinBox->setSingleStep(0.1);
+    zoomScaleSpinBox->setSingleStep(1);
     zoomScaleSpinBox->setMinimum(qFloor(VMainGraphicsView::MinScale()*1000)/10.0);
     zoomScaleSpinBox->setMaximum(qFloor(VMainGraphicsView::MaxScale()*1000)/10.0);
     zoomScaleSpinBox->setSuffix("%");

diff --git a/src/app/seamly2d/mainwindow.ui b/src/app/seamly2d/mainwindow.ui
@@ -1258,7 +1258,7 @@
                <rect>
                 <x>0</x>
                 <y>0</y>
-                <width>111</width>
+                <width>128</width>
                 <height>58</height>
                </rect>
               </property>
@@ -3632,7 +3632,7 @@
     <string>Zoom In (Ctrl++)</string>
    </property>
    <property name="shortcut">
-    <string notr="true">Ctrl++</string>
+    <string notr="true"/>
    </property>
    <property name="menuRole">
     <enum>QAction::NoRole</enum>
@@ -3656,7 +3656,7 @@
     <string>Zoom Out (Ctrl+-)</string>
    </property>
    <property name="shortcut">
-    <string notr="true">Ctrl+-</string>
+    <string notr="true"/>
    </property>
    <property name="menuRole">
     <enum>QAction::NoRole</enum>
@@ -3698,10 +3698,10 @@
     <string>Fit</string>
    </property>
    <property name="toolTip">
-    <string>Zoom to Fit All(Ctrl+=)</string>
+    <string>Zoom to Fit All(Ctrl+9)</string>
    </property>
    <property name="shortcut">
-    <string notr="true">Ctrl+=</string>
+    <string notr="true">Ctrl+9</string>
    </property>
    <property name="menuRole">
     <enum>QAction::NoRole</enum>
@@ -4080,7 +4080,7 @@
     <string>Zoom to Previous (Ctrl+Left)</string>
    </property>
    <property name="shortcut">
-    <string>Ctrl+Left</string>
+    <string notr="true">Ctrl+Left</string>
    </property>
   </action>
   <action name="zoomToArea_Action">
@@ -4101,7 +4101,7 @@
     <string>Zoom to selected Area (Ctrl+A)</string>
    </property>
    <property name="shortcut">
-    <string>Ctrl+A</string>
+    <string notr="true">Ctrl+A</string>
    </property>
   </action>
   <action name="zoomPan_Action">
@@ -4122,7 +4122,7 @@
     <string>Pan Work Area (Z, P)</string>
    </property>
    <property name="shortcut">
-    <string>Z, P</string>
+    <string notr="true">Z, P</string>
    </property>
   </action>
   <action name="zoom100Percent_Action">
@@ -4134,16 +4134,16 @@
      <normaloff>:/icons/win.icon.theme/24x24/actions/zoom_100_percent.png</normaloff>:/icons/win.icon.theme/24x24/actions/zoom_100_percent.png</iconset>
    </property>
    <property name="text">
-    <string>Zoom 1:1</string>
+    <string>Zoom 100%</string>
    </property>
    <property name="iconText">
-    <string>1:1</string>
+    <string>100%</string>
    </property>
    <property name="toolTip">
     <string>Zoom to 100 percent (Ctrl+0)</string>
    </property>
    <property name="shortcut">
-    <string>Ctrl+0</string>
+    <string notr="true">Ctrl+0</string>
    </property>
   </action>
   <action name="points_Action">
@@ -4736,7 +4736,7 @@
     <string>Zoom to point (Ctrl + Alt + P)</string>
    </property>
    <property name="shortcut">
-    <string>Ctrl+Alt+P</string>
+    <string notr="true">Ctrl+Alt+P</string>
    </property>
   </action>
   <action name="importImage_Action">
@@ -4768,8 +4768,8 @@
  </customwidgets>
  <resources>
   <include location="share/resources/toolicon.qrc"/>
-  <include location="../../libs/vmisc/share/resources/icon.qrc"/>
   <include location="../../libs/vmisc/share/resources/theme.qrc"/>
+  <include location="../../libs/vmisc/share/resources/icon.qrc"/>
  </resources>
  <connections/>
 </ui>