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.

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

Fix typos #520

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion plugins/player_mpv/src/mpvwidget.h
Original file line number Diff line number Diff line change
Expand Up @@ -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<int>(QOpenGLWidget::width() * this->devicePixelRatioF());
}
Expand Down
2 changes: 1 addition & 1 deletion qimgv/3rdparty/QtOpenCV/cvmatandqimage.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion qimgv/3rdparty/QtOpenCV/cvmatandqimage.h
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down
4 changes: 2 additions & 2 deletions qimgv/components/directorymodel.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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())
Expand Down
2 changes: 1 addition & 1 deletion qimgv/core.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -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<Image> forScale = model->getImage(state.currentFilePath);
if(forScale) {
Expand Down
2 changes: 1 addition & 1 deletion qimgv/gui/customwidgets/floatingwidget.h
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand Down
2 changes: 1 addition & 1 deletion qimgv/gui/customwidgets/thumbnailview.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -601,7 +601,7 @@ void ThumbnailView::scrollSmooth(int delta, qreal multiplier, qreal acceleration
createScrollTimeLine();
if(!redirect && additive)
newEndFrame = oldEndFrame - static_cast<int>(delta * multiplier * acceleration);
// force load thumbs inbetween scroll animations
// force load thumbs in between scroll animations
blockThumbnailLoading = false;
loadVisibleThumbnails();
}
Expand Down
2 changes: 1 addition & 1 deletion qimgv/gui/folderview/bookmarksitem.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,7 @@ void BookmarksItem::paintEvent(QPaintEvent *event) {

void BookmarksItem::dropEvent(QDropEvent *event) {
QList<QString> 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);
Expand Down
2 changes: 1 addition & 1 deletion qimgv/gui/folderview/treeviewcustom.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ void TreeViewCustom::dropEvent(QDropEvent *event) {
QModelIndex dropIndex = indexAt(event->pos());
if(dropIndex.isValid()) {
QList<QString> 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);
Expand Down
2 changes: 1 addition & 1 deletion qimgv/gui/mainwindow.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -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?
}
Expand Down
2 changes: 1 addition & 1 deletion qimgv/gui/viewers/viewerwidget.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
2 changes: 1 addition & 1 deletion qimgv/res/translations/en_US.ts
Original file line number Diff line number Diff line change
Expand Up @@ -771,7 +771,7 @@
</message>
<message>
<location filename="../../utils/fileoperations.cpp" line="43"/>
<source>Operation completed succesfully.</source>
<source>Operation completed successfully.</source>
<translation type="unfinished"></translation>
</message>
<message>
Expand Down
2 changes: 1 addition & 1 deletion qimgv/res/translations/uk_UA.ts
Original file line number Diff line number Diff line change
Expand Up @@ -771,7 +771,7 @@
</message>
<message>
<location filename="../../utils/fileoperations.cpp" line="43"/>
<source>Operation completed succesfully.</source>
<source>Operation completed successfully.</source>
<translation>Операція виконана успішно.</translation>
</message>
<message>
Expand Down
2 changes: 1 addition & 1 deletion qimgv/res/translations/zh_CN.ts
Original file line number Diff line number Diff line change
Expand Up @@ -771,7 +771,7 @@
</message>
<message>
<location filename="../../utils/fileoperations.cpp" line="43"/>
<source>Operation completed succesfully.</source>
<source>Operation completed successfully.</source>
<translatorcomment>操作成功完成.</translatorcomment>
<translation></translation>
</message>
Expand Down
2 changes: 1 addition & 1 deletion qimgv/settings.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -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();
Expand Down
2 changes: 1 addition & 1 deletion qimgv/shortcutbuilder.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -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())
Expand Down
4 changes: 2 additions & 2 deletions qimgv/sourcecontainers/imagestatic.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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;
Expand Down
4 changes: 2 additions & 2 deletions qimgv/utils/fileoperations.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down Expand Up @@ -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();
Expand Down
2 changes: 1 addition & 1 deletion qimgv/utils/wallpapersetter.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -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
}