Skip to content

Commit

Permalink
Remove scrolling on some widgets #322 + Qt 6.8.1 bugfixes
Browse files Browse the repository at this point in the history
  • Loading branch information
Lymphatus committed Dec 8, 2024
1 parent 92a22ba commit 3c04f4d
Show file tree
Hide file tree
Showing 32 changed files with 669 additions and 663 deletions.
12 changes: 6 additions & 6 deletions .idea/QtSettings.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 0 additions & 4 deletions .idea/misc.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

15 changes: 8 additions & 7 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,7 @@ endif ()

set(LIBCAESIUM_SOURCE_DIR ${CMAKE_BINARY_DIR}/libcaesium-prefix/src/libcaesium)

if(NOT CMAKE_BUILD_TYPE)
if (NOT CMAKE_BUILD_TYPE)
set(CMAKE_BUILD_TYPE "Release")
endif ()

Expand Down Expand Up @@ -116,14 +116,15 @@ set(SOURCES
src/dialogs/UsageStatsDialog.cpp
src/dialogs/AdvancedImportDialog.cpp
src/services/Importer.cpp
src/filters/QSliderScrollFilter.cpp
)

if (APPLE)
set(OSX_SOURCES
src/updater/osx/AutoUpdater.cpp
src/updater/osx/CocoaInitializer.mm
src/updater/osx/SparkleAutoUpdater.mm
)
)
endif ()

set(UI
Expand Down Expand Up @@ -153,7 +154,7 @@ SET(TS_FILES
resources/i18n/caesium_sk_SK.ts
resources/i18n/caesium_pl_PL.ts
resources/i18n/caesium_fi_FI.ts
)
)

set_source_files_properties(${TS_FILES} PROPERTIES OUTPUT_LOCATION ${CMAKE_BINARY_DIR}/i18n)
if (QT_VERSION_MAJOR EQUAL "6")
Expand All @@ -180,11 +181,11 @@ else ()
install(TARGETS ${TARGET} RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR})
if (NOT LIBCAESIUM)
install(
FILES ${LIBCAESIUM_SOURCE_DIR}/target/${LIBCAESIUM_BUILD_TYPE}/libcaesium.so
DESTINATION ${CMAKE_INSTALL_PREFIX}/lib
FILES ${LIBCAESIUM_SOURCE_DIR}/target/${LIBCAESIUM_BUILD_TYPE}/libcaesium.so
DESTINATION ${CMAKE_INSTALL_PREFIX}/lib
)
install(
CODE "execute_process(
CODE "execute_process(
COMMAND ${CMAKE_COMMAND} -E create_symlink
${CMAKE_INSTALL_PREFIX}/lib/libcaesium.so
/usr/lib/libcaesium.so
Expand All @@ -204,7 +205,7 @@ set(CARGO_TARGET "")
if (WIN32)
set(CARGO_TARGET "--target=x86_64-pc-windows-gnu")
set(LIBCAESIUM_EXTERNAL_PATH ${LIBCAESIUM_SOURCE_DIR}/target/x86_64-pc-windows-gnu/${LIBCAESIUM_BUILD_TYPE}/caesium.dll)
else()
else ()
set(LIBCAESIUM_EXTERNAL_PATH ${LIBCAESIUM_SOURCE_DIR}/target/${LIBCAESIUM_BUILD_TYPE}/libcaesium.so)
endif ()

Expand Down
4 changes: 2 additions & 2 deletions Info.plist
Original file line number Diff line number Diff line change
Expand Up @@ -19,9 +19,9 @@
<key>NSSupportsAutomaticGraphicsSwitching</key>
<true/>
<key>CFBundleShortVersionString</key>
<string>2.8.2</string>
<string>2.8.3</string>
<key>CFBundleVersion</key>
<string>2.8.2</string>
<string>2.8.3</string>
<key>SUFeedURL</key>
<string>https://saerasoft.com/repository/com.saerasoft.caesium/osx/appcast.xml</string>
<key>SUEnableAutomaticChecks</key>
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@

Try it directly on browser at [caesium.app](https://caesium.app)

###### v2.8.2
###### v2.8.3

![caesium_screenshot_280](https://github.com/user-attachments/assets/e5a6510a-58c5-4349-8563-f4e3ee84d5a0)

Expand Down
66 changes: 33 additions & 33 deletions resources/i18n/caesium_ar_EG.ts
Original file line number Diff line number Diff line change
Expand Up @@ -186,29 +186,29 @@ All rights reserved.</translation>
<context>
<name>MainWindow</name>
<message>
<location filename="../../src/MainWindow.cpp" line="276"/>
<location filename="../../src/MainWindow.cpp" line="279"/>
<source>Import files...</source>
<translation>استيراد ملفات...</translation>
</message>
<message>
<location filename="../../src/MainWindow.cpp" line="292"/>
<location filename="../../src/MainWindow.cpp" line="295"/>
<source>Import folder...</source>
<translation>استيراد المجلد...</translation>
</message>
<message>
<location filename="../../src/MainWindow.cpp" line="517"/>
<location filename="../../src/MainWindow.cpp" line="520"/>
<source>Importing files...</source>
<translation>جاري استيراد ملفات...</translation>
</message>
<message>
<location filename="../../views/MainWindow.ui" line="1641"/>
<location filename="../../src/MainWindow.cpp" line="517"/>
<location filename="../../src/MainWindow.cpp" line="726"/>
<location filename="../../src/MainWindow.cpp" line="520"/>
<location filename="../../src/MainWindow.cpp" line="729"/>
<source>Cancel</source>
<translation>إلغاء</translation>
</message>
<message>
<location filename="../../src/MainWindow.cpp" line="603"/>
<location filename="../../src/MainWindow.cpp" line="606"/>
<source>You are about to overwrite your original images and this action can&apos;t be undone.

Do you really want to continue?</source>
Expand All @@ -217,66 +217,66 @@ Do you really want to continue?</source>
هل تريد حقًا الاستمرار؟</translation>
</message>
<message>
<location filename="../../src/MainWindow.cpp" line="605"/>
<location filename="../../src/MainWindow.cpp" line="608"/>
<source>No</source>
<translation>لا</translation>
</message>
<message>
<location filename="../../src/MainWindow.cpp" line="1213"/>
<location filename="../../src/MainWindow.cpp" line="1218"/>
<location filename="../../src/MainWindow.cpp" line="1216"/>
<location filename="../../src/MainWindow.cpp" line="1221"/>
<source>File not found</source>
<translation>الملف غير موجود</translation>
</message>
<message>
<location filename="../../src/MainWindow.cpp" line="1249"/>
<location filename="../../src/MainWindow.cpp" line="1252"/>
<source>Finishing...</source>
<translation>جاري الإنهاء...</translation>
</message>
<message>
<location filename="../../src/MainWindow.cpp" line="637"/>
<location filename="../../src/MainWindow.cpp" line="1316"/>
<location filename="../../src/MainWindow.cpp" line="640"/>
<location filename="../../src/MainWindow.cpp" line="1319"/>
<source>Compressing...</source>
<translation>جاري الضغط...</translation>
</message>
<message>
<location filename="../../src/MainWindow.cpp" line="723"/>
<location filename="../../src/MainWindow.cpp" line="726"/>
<source>Do you really want to quit?</source>
<translation>هل حقا تريد الخروج؟</translation>
</message>
<message>
<location filename="../../src/MainWindow.cpp" line="604"/>
<location filename="../../src/MainWindow.cpp" line="725"/>
<location filename="../../src/MainWindow.cpp" line="607"/>
<location filename="../../src/MainWindow.cpp" line="728"/>
<source>Yes</source>
<translation>نعم</translation>
</message>
<message>
<location filename="../../src/MainWindow.cpp" line="589"/>
<location filename="../../src/MainWindow.cpp" line="592"/>
<source>Please select an output folder first</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../../src/MainWindow.cpp" line="590"/>
<location filename="../../src/MainWindow.cpp" line="838"/>
<location filename="../../src/MainWindow.cpp" line="593"/>
<location filename="../../src/MainWindow.cpp" line="841"/>
<source>Ok</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../../src/MainWindow.cpp" line="747"/>
<location filename="../../src/MainWindow.cpp" line="750"/>
<source>Select output folder...</source>
<translation>حدد مجلد المخرجات...</translation>
</message>
<message>
<location filename="../../src/MainWindow.cpp" line="813"/>
<location filename="../../src/MainWindow.cpp" line="816"/>
<source>Compression finished!</source>
<translation>انتهى الضغط!</translation>
</message>
<message>
<location filename="../../src/MainWindow.cpp" line="828"/>
<location filename="../../src/MainWindow.cpp" line="831"/>
<source>You just saved %1!</source>
<translation>لقد وفرت لتو %1!</translation>
</message>
<message>
<location filename="../../src/MainWindow.cpp" line="832"/>
<location filename="../../src/MainWindow.cpp" line="835"/>
<source>Total files: %1
Original size: %2
Compressed size: %3
Expand All @@ -287,7 +287,7 @@ Saved: %4 (%5%)</source>
تم توفير: %4 (%5%)</translation>
</message>
<message>
<location filename="../../src/MainWindow.cpp" line="1499"/>
<location filename="../../src/MainWindow.cpp" line="1502"/>
<source>Recompress failed</source>
<translation type="unfinished"></translation>
</message>
Expand Down Expand Up @@ -409,12 +409,12 @@ Saved: %4 (%5%)</source>
</message>
<message>
<location filename="../../views/MainWindow.ui" line="1211"/>
<location filename="../../src/MainWindow.cpp" line="872"/>
<location filename="../../src/MainWindow.cpp" line="876"/>
<location filename="../../src/MainWindow.cpp" line="911"/>
<location filename="../../src/MainWindow.cpp" line="875"/>
<location filename="../../src/MainWindow.cpp" line="879"/>
<location filename="../../src/MainWindow.cpp" line="914"/>
<location filename="../../src/MainWindow.cpp" line="923"/>
<location filename="../../src/MainWindow.cpp" line="917"/>
<location filename="../../src/MainWindow.cpp" line="926"/>
<location filename="../../src/MainWindow.cpp" line="929"/>
<source>px</source>
<translation>px</translation>
</message>
Expand Down Expand Up @@ -502,7 +502,7 @@ Saved: %4 (%5%)</source>
</message>
<message>
<location filename="../../views/MainWindow.ui" line="2063"/>
<location filename="../../src/MainWindow.cpp" line="1234"/>
<location filename="../../src/MainWindow.cpp" line="1237"/>
<source>Preview</source>
<translation>لمحه</translation>
</message>
Expand Down Expand Up @@ -654,7 +654,7 @@ Saved: %4 (%5%)</source>
</message>
<message>
<location filename="../../views/MainWindow.ui" line="1916"/>
<location filename="../../src/MainWindow.cpp" line="217"/>
<location filename="../../src/MainWindow.cpp" line="220"/>
<source>Exit</source>
<translation>خروج</translation>
</message>
Expand Down Expand Up @@ -740,13 +740,13 @@ Saved: %4 (%5%)</source>
</message>
<message>
<location filename="../../views/MainWindow.ui" line="994"/>
<location filename="../../src/MainWindow.cpp" line="886"/>
<location filename="../../src/MainWindow.cpp" line="890"/>
<location filename="../../src/MainWindow.cpp" line="889"/>
<location filename="../../src/MainWindow.cpp" line="893"/>
<source>%</source>
<translation>%</translation>
</message>
<message>
<location filename="../../src/MainWindow.cpp" line="1051"/>
<location filename="../../src/MainWindow.cpp" line="1054"/>
<source>images in list</source>
<translation>الصور في القائمة</translation>
</message>
Expand Down Expand Up @@ -941,7 +941,7 @@ Saved: %4 (%5%)</source>
<name>QIODevice</name>
<message>
<location filename="../../src/dialogs/AdvancedImportDialog.cpp" line="131"/>
<location filename="../../src/MainWindow.cpp" line="278"/>
<location filename="../../src/MainWindow.cpp" line="281"/>
<source>Image Files</source>
<translation>ملفات الصور</translation>
</message>
Expand Down
Loading

0 comments on commit 3c04f4d

Please sign in to comment.