diff --git a/plugins/player_mpv/src/mpvwidget.h b/plugins/player_mpv/src/mpvwidget.h index 04bdc910..8a682ba6 100644 --- a/plugins/player_mpv/src/mpvwidget.h +++ b/plugins/player_mpv/src/mpvwidget.h @@ -26,7 +26,7 @@ class MpvWidget Q_DECL_FINAL: public QOpenGLWidget { QVariant getProperty(const QString& name) const; // Related to this: // https://github.com/gnome-mpv/gnome-mpv/issues/245 - // Let's hope this wont break more than it fixes + // Let's hope this won't break more than it fixes int width() const { return static_cast(QOpenGLWidget::width() * this->devicePixelRatioF()); } diff --git a/qimgv/3rdparty/QtOpenCV/cvmatandqimage.cpp b/qimgv/3rdparty/QtOpenCV/cvmatandqimage.cpp index 4112a693..08a781e7 100644 --- a/qimgv/3rdparty/QtOpenCV/cvmatandqimage.cpp +++ b/qimgv/3rdparty/QtOpenCV/cvmatandqimage.cpp @@ -294,7 +294,7 @@ QImage mat2Image(const cv::Mat &mat, MatColorOrder order, QImage::Format formatH #endif } - //Channel order requried by the target QImage + //Channel order required by the target QImage MatColorOrder requiredOrder = getColorOrderOfRGB32Format(); #if QT_VERSION >= 0x050200 if (formatHint == QImage::Format_RGBX8888 diff --git a/qimgv/3rdparty/QtOpenCV/cvmatandqimage.h b/qimgv/3rdparty/QtOpenCV/cvmatandqimage.h index c2607fd6..f3381d84 100644 --- a/qimgv/3rdparty/QtOpenCV/cvmatandqimage.h +++ b/qimgv/3rdparty/QtOpenCV/cvmatandqimage.h @@ -80,7 +80,7 @@ QImage mat2Image(const cv::Mat &mat, MatColorOrder order=MCO_BGR, QImage::Format * endian system or (A R G B) in big endian system. * * - User must make sure that the color channels order is the same as - * the color channels order requried by QImage. + * the color channels order required by QImage. */ cv::Mat image2Mat_shared(const QImage &img, MatColorOrder *order=0); QImage mat2Image_shared(const cv::Mat &mat, QImage::Format formatHint = QImage::Format_Invalid); diff --git a/qimgv/components/directorymodel.cpp b/qimgv/components/directorymodel.cpp index e56ea2f0..9a2d760f 100644 --- a/qimgv/components/directorymodel.cpp +++ b/qimgv/components/directorymodel.cpp @@ -137,7 +137,7 @@ void DirectoryModel::removeFile(const QString &filePath, bool trash, FileOpResul void DirectoryModel::renameEntry(const QString &oldPath, const QString &newName, bool force, FileOpResult &result) { bool isDir = dirManager.isDir(oldPath); FileOperations::rename(oldPath, newName, force, result); - // chew through watcher events so they wont be processed out of order + // chew through watcher events so they won't be processed out of order qApp->processEvents(); if(result != FileOpResult::SUCCESS) return; @@ -165,7 +165,7 @@ void DirectoryModel::copyFileTo(const QString &srcFile, const QString &destDirPa void DirectoryModel::moveFileTo(const QString &srcFile, const QString &destDirPath, bool force, FileOpResult &result) { FileOperations::moveFileTo(srcFile, destDirPath, force, result); - // chew through watcher events so they wont be processed out of order + // chew through watcher events so they won't be processed out of order qApp->processEvents(); if(result == FileOpResult::SUCCESS) { if(destDirPath != this->directoryPath()) diff --git a/qimgv/core.cpp b/qimgv/core.cpp index 15d6e11a..5e4605d6 100644 --- a/qimgv/core.cpp +++ b/qimgv/core.cpp @@ -1182,7 +1182,7 @@ void Core::print() { } void Core::scalingRequest(QSize size, ScalingFilter filter) { - // filter out an unnecessary scale request at statup + // filter out an unnecessary scale request at startup if(mw->isVisible() && state.hasActiveImage) { std::shared_ptr forScale = model->getImage(state.currentFilePath); if(forScale) { diff --git a/qimgv/gui/customwidgets/floatingwidget.h b/qimgv/gui/customwidgets/floatingwidget.h index 0b452211..646a431d 100644 --- a/qimgv/gui/customwidgets/floatingwidget.h +++ b/qimgv/gui/customwidgets/floatingwidget.h @@ -38,7 +38,7 @@ public slots: void mouseReleaseEvent(QMouseEvent *event); void wheelEvent(QWheelEvent *event); private: - // size of whatever widget we are overlayed on + // size of whatever widget we are overlaid on QSize container; bool mAcceptKeyboardFocus; diff --git a/qimgv/gui/customwidgets/thumbnailview.cpp b/qimgv/gui/customwidgets/thumbnailview.cpp index 49049576..2e640c83 100644 --- a/qimgv/gui/customwidgets/thumbnailview.cpp +++ b/qimgv/gui/customwidgets/thumbnailview.cpp @@ -601,7 +601,7 @@ void ThumbnailView::scrollSmooth(int delta, qreal multiplier, qreal acceleration createScrollTimeLine(); if(!redirect && additive) newEndFrame = oldEndFrame - static_cast(delta * multiplier * acceleration); - // force load thumbs inbetween scroll animations + // force load thumbs in between scroll animations blockThumbnailLoading = false; loadVisibleThumbnails(); } diff --git a/qimgv/gui/folderview/bookmarksitem.cpp b/qimgv/gui/folderview/bookmarksitem.cpp index ec79a27c..3dfe0d5a 100644 --- a/qimgv/gui/folderview/bookmarksitem.cpp +++ b/qimgv/gui/folderview/bookmarksitem.cpp @@ -70,7 +70,7 @@ void BookmarksItem::paintEvent(QPaintEvent *event) { void BookmarksItem::dropEvent(QDropEvent *event) { QList paths; - // TODO: QUrl gave me some issues previosly, test + // TODO: QUrl gave me some issues previously, test for(auto url : event->mimeData()->urls()) paths << url.toLocalFile(); emit droppedIn(paths, dirPath); diff --git a/qimgv/gui/folderview/treeviewcustom.cpp b/qimgv/gui/folderview/treeviewcustom.cpp index 454263d2..0d54fb0d 100644 --- a/qimgv/gui/folderview/treeviewcustom.cpp +++ b/qimgv/gui/folderview/treeviewcustom.cpp @@ -20,7 +20,7 @@ void TreeViewCustom::dropEvent(QDropEvent *event) { QModelIndex dropIndex = indexAt(event->pos()); if(dropIndex.isValid()) { QList paths; - // TODO: QUrl gave me some issues previosly, test + // TODO: QUrl gave me some issues previously, test for(auto url : event->mimeData()->urls()) paths << url.toLocalFile(); emit droppedIn(paths, dropIndex); diff --git a/qimgv/gui/mainwindow.cpp b/qimgv/gui/mainwindow.cpp index 9f8e0445..a33043b5 100644 --- a/qimgv/gui/mainwindow.cpp +++ b/qimgv/gui/mainwindow.cpp @@ -235,7 +235,7 @@ void MW::preShowResize(QSize sz) { if(this->isVisible()) setGeometry(newGeom); - else // setGeometry wont work on hidden windows, so we just save for it to be restored later + else // setGeometry won't work on hidden windows, so we just save for it to be restored later settings->setWindowGeometry(newGeom); qApp->processEvents(); // not needed anymore with patched qt? } diff --git a/qimgv/gui/viewers/viewerwidget.cpp b/qimgv/gui/viewers/viewerwidget.cpp index 9293916c..1708d0f1 100644 --- a/qimgv/gui/viewers/viewerwidget.cpp +++ b/qimgv/gui/viewers/viewerwidget.cpp @@ -19,7 +19,7 @@ ViewerWidget::ViewerWidget(QWidget *parent) setAttribute(Qt::WA_TranslucentBackground, true); setMouseTracking(true); #ifdef Q_OS_LINUX - // we cant check cursor position on wayland until the mouse is moved + // we can't check cursor position on wayland until the mouse is moved // use this to skip cursor check once if(qgetenv("XDG_SESSION_TYPE") == "wayland") mWaylandCursorWorkaround = true; diff --git a/qimgv/res/translations/en_US.ts b/qimgv/res/translations/en_US.ts index f72b2e24..8e4718ac 100644 --- a/qimgv/res/translations/en_US.ts +++ b/qimgv/res/translations/en_US.ts @@ -771,7 +771,7 @@ - Operation completed succesfully. + Operation completed successfully. diff --git a/qimgv/res/translations/uk_UA.ts b/qimgv/res/translations/uk_UA.ts index f677b780..5e24f905 100644 --- a/qimgv/res/translations/uk_UA.ts +++ b/qimgv/res/translations/uk_UA.ts @@ -771,7 +771,7 @@ - Operation completed succesfully. + Operation completed successfully. Операція виконана успішно. diff --git a/qimgv/res/translations/zh_CN.ts b/qimgv/res/translations/zh_CN.ts index 67f310c5..6e68f05c 100644 --- a/qimgv/res/translations/zh_CN.ts +++ b/qimgv/res/translations/zh_CN.ts @@ -771,7 +771,7 @@ - Operation completed succesfully. + Operation completed successfully. 操作成功完成. diff --git a/qimgv/settings.cpp b/qimgv/settings.cpp index 473f9f81..27d901b3 100644 --- a/qimgv/settings.cpp +++ b/qimgv/settings.cpp @@ -589,7 +589,7 @@ void Settings::setPanelPinned(bool mode) { /* * 0: fit window * 1: fit width - * 2: orginal size + * 2: original size */ ImageFitMode Settings::imageFitMode() { int mode = settings->settingsConf->value("defaultFitMode", 0).toInt(); diff --git a/qimgv/shortcutbuilder.cpp b/qimgv/shortcutbuilder.cpp index 0d3d2e64..3bb19a93 100644 --- a/qimgv/shortcutbuilder.cpp +++ b/qimgv/shortcutbuilder.cpp @@ -102,7 +102,7 @@ QString ShortcutBuilder::fromEventNativeScanCode(QKeyEvent *event) { // Still has some issues like when you use two layouts // where on the same button you have a letter on one layout and some symbol on the other. // I'm leaving this as-is because trying to fix all layouts will turn into a mess real quick. - // You can always just add the same keybind using your alt. layout if it doesnt work. + // You can always just add the same keybind using your alt. layout if it doesn't work. QString sequence = inputMap->keys().value(event->nativeScanCode()); if(sequence.isEmpty()) diff --git a/qimgv/sourcecontainers/imagestatic.cpp b/qimgv/sourcecontainers/imagestatic.cpp index da294e09..db599d20 100644 --- a/qimgv/sourcecontainers/imagestatic.cpp +++ b/qimgv/sourcecontainers/imagestatic.cpp @@ -32,7 +32,7 @@ void ImageStatic::loadGeneric() { /* QImageReader::read() seems more reliable than just reading via QImage. * For example: "Invalid JPEG file structure: two SOF markers" * QImageReader::read() returns false, but still reads an image. Meanwhile QImage just fails. - * I havent checked qimage's code, but it seems like it sees an exception + * I haven't checked qimage's code, but it seems like it sees an exception * from libjpeg or whatever and just gives up on reading the file. * * tldr: qimage bad @@ -84,7 +84,7 @@ bool ImageStatic::save(QString destPath) { QString ext = fi.suffix(); // png compression note from libpng // Note that tests have shown that zlib compression levels 3-6 usually perform as well - // as level 9 for PNG images, and do considerably fewer caclulations + // as level 9 for PNG images, and do considerably fewer calculations int quality = 95; if(ext.compare("png", Qt::CaseInsensitive) == 0) quality = 30; diff --git a/qimgv/utils/fileoperations.cpp b/qimgv/utils/fileoperations.cpp index 6cbd931e..6e3d5f25 100644 --- a/qimgv/utils/fileoperations.cpp +++ b/qimgv/utils/fileoperations.cpp @@ -40,7 +40,7 @@ void FileOperations::removeDir(const QString &dirPath, bool recursive, FileOpRes QString FileOperations::decodeResult(const FileOpResult &result) { switch(result) { case FileOpResult::SUCCESS: - return QObject::tr("Operation completed succesfully."); + return QObject::tr("Operation completed successfully."); case FileOpResult::DESTINATION_FILE_EXISTS: return QObject::tr("Destination file exists."); case FileOpResult::DESTINATION_DIR_EXISTS: @@ -322,7 +322,7 @@ bool FileOperations::moveToTrashImpl(const QString &filePath) { } QFileInfo original( filePath ); if( !original.exists() ) - qDebug() << "File doesn`t exist, cant move to trash"; + qDebug() << "File doesn`t exist, can't move to trash"; QString info; info += "[Trash Info]\nPath="; info += original.absoluteFilePath(); diff --git a/qimgv/utils/wallpapersetter.cpp b/qimgv/utils/wallpapersetter.cpp index f144e5e0..a1967560 100644 --- a/qimgv/utils/wallpapersetter.cpp +++ b/qimgv/utils/wallpapersetter.cpp @@ -20,6 +20,6 @@ void WallpaperSetter::setWallpaper(QString path) { process.waitForFinished(); process.close(); - qDebug() << "In case that didnt work your cropped wallpaper is saved at:" << path; + qDebug() << "In case that didn't work your cropped wallpaper is saved at:" << path; #endif }