Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

bug: Fix zoom shortcuts #1182

Merged
merged 3 commits into from
Aug 26, 2024
Merged

bug: Fix zoom shortcuts #1182

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
7652420
fix zoom shortcuts
DSCaskey Aug 12, 2024
c8571d2
lupdate
DSCaskey Aug 12, 2024
85accea
Merge branch 'develop' into fix-zoom-shortcuts
DSCaskey Aug 20, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
246 changes: 17 additions & 229 deletions share/translations/seamly2d_cs_CZ.ts
View file
Open in desktop

Large diffs are not rendered by default.

337 changes: 62 additions & 275 deletions share/translations/seamly2d_de_DE.ts
View file
Open in desktop

Large diffs are not rendered by default.

246 changes: 17 additions & 229 deletions share/translations/seamly2d_el_GR.ts
View file
Open in desktop

Large diffs are not rendered by default.

246 changes: 17 additions & 229 deletions share/translations/seamly2d_en_CA.ts
View file
Open in desktop

Large diffs are not rendered by default.

246 changes: 17 additions & 229 deletions share/translations/seamly2d_en_GB.ts
View file
Open in desktop

Large diffs are not rendered by default.

246 changes: 17 additions & 229 deletions share/translations/seamly2d_en_IN.ts
View file
Open in desktop

Large diffs are not rendered by default.

246 changes: 17 additions & 229 deletions share/translations/seamly2d_en_US.ts
View file
Open in desktop

Large diffs are not rendered by default.

285 changes: 36 additions & 249 deletions share/translations/seamly2d_es_ES.ts
View file
Open in desktop

Large diffs are not rendered by default.

246 changes: 17 additions & 229 deletions share/translations/seamly2d_fi_FI.ts
View file
Open in desktop

Large diffs are not rendered by default.

248 changes: 18 additions & 230 deletions share/translations/seamly2d_fr_FR.ts
View file
Open in desktop

Large diffs are not rendered by default.

246 changes: 17 additions & 229 deletions share/translations/seamly2d_he_IL.ts
View file
Open in desktop

Large diffs are not rendered by default.

246 changes: 17 additions & 229 deletions share/translations/seamly2d_id_ID.ts
View file
Open in desktop

Large diffs are not rendered by default.

246 changes: 17 additions & 229 deletions share/translations/seamly2d_it_IT.ts
View file
Open in desktop

Large diffs are not rendered by default.

268 changes: 28 additions & 240 deletions share/translations/seamly2d_nl_NL.ts
View file
Open in desktop

Large diffs are not rendered by default.

246 changes: 17 additions & 229 deletions share/translations/seamly2d_pt_BR.ts
View file
Open in desktop

Large diffs are not rendered by default.

246 changes: 17 additions & 229 deletions share/translations/seamly2d_ro_RO.ts
View file
Open in desktop

Large diffs are not rendered by default.

252 changes: 20 additions & 232 deletions share/translations/seamly2d_ru_RU.ts
View file
Open in desktop

Large diffs are not rendered by default.

246 changes: 17 additions & 229 deletions share/translations/seamly2d_uk_UA.ts
View file
Open in desktop

Large diffs are not rendered by default.

246 changes: 17 additions & 229 deletions share/translations/seamly2d_zh_CN.ts
View file
Open in desktop

Large diffs are not rendered by default.

112 changes: 56 additions & 56 deletions src/app/seamly2d/dialogs/shortcuts_dialog.cpp
View file
Open in desktop

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions src/app/seamly2d/mainwindow.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);

Expand Down Expand Up @@ -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("%");
Expand Down
26 changes: 13 additions & 13 deletions src/app/seamly2d/mainwindow.ui
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1258,7 +1258,7 @@
<rect>
<x>0</x>
<y>0</y>
<width>111</width>
<width>128</width>
<height>58</height>
</rect>
</property>
Expand Down Expand Up @@ -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>
Expand All @@ -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>
Expand Down Expand Up @@ -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>
Expand Down Expand Up @@ -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">
Expand All @@ -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">
Expand All @@ -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">
Expand All @@ -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">
Expand Down Expand Up @@ -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">
Expand Down Expand Up @@ -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>
Loading