paths.diff 1.9 KB

123456789101112131415161718192021222324252627282930313233343536373839404142
  1. diff -Naur re-typeset-1.2.0/re-typeset-src/mainwindow.cpp re-typeset-1.2.0.patched/re-typeset-src/mainwindow.cpp
  2. --- re-typeset-1.2.0/re-typeset-src/mainwindow.cpp 2016-10-13 15:51:19.000000000 -0400
  3. +++ re-typeset-1.2.0.patched/re-typeset-src/mainwindow.cpp 2018-12-25 12:17:28.448448693 -0500
  4. @@ -22,6 +22,7 @@
  5. #include "mainwindow.hpp"
  6. #include "license.hpp"
  7. #include "ui_mainwindow.h"
  8. +#include <QLibraryInfo>
  9. #include <QImage>
  10. #include <QDebug>
  11. #include <QPainter>
  12. @@ -43,7 +44,7 @@
  13. ui->pageSizeWidth->setSuffix( " px" );
  14. createLanguageMenu();
  15. - setWindowIcon( QIcon( QApplication::applicationDirPath() + "res/re-typeset.png" ) );
  16. + setWindowIcon( QIcon( "/usr/share/pixmaps/re-typeset.png" ) );
  17. QString locale = QLocale::system().name();
  18. locale.truncate(locale.lastIndexOf('_'));
  19. @@ -332,8 +333,8 @@
  20. currLang_ = rLanguage;
  21. QLocale locale = QLocale(currLang_);
  22. QLocale::setDefault(locale);
  23. - switchTranslator(translator_, QString("res/re-typeset_%1.qm").arg(rLanguage));
  24. - switchTranslator(translatorQt_, QString("languages/qt_%1.qm").arg(rLanguage));
  25. + switchTranslator(translator_, QString("/usr/share/re-typeset/re-typeset_%1.qm").arg(rLanguage));
  26. + switchTranslator(translatorQt_, QString("%1/qt_%2.qm").arg(QLibraryInfo::location(QLibraryInfo::TranslationsPath)).arg(rLanguage));
  27. }
  28. }
  29. @@ -343,8 +344,7 @@
  30. connect(langGroup, SIGNAL(triggered(QAction *)), this, SLOT(slotLanguageChanged(QAction *)));
  31. QString defaultLocale = QLocale::system().name(); // e.g. "de_DE" // format systems language
  32. defaultLocale.truncate(defaultLocale.lastIndexOf('_')); // e.g. "de"
  33. - langPath_ = QApplication::applicationDirPath();
  34. - langPath_.append("/res");
  35. + langPath_ = QString("/usr/share/re-typeset");
  36. QDir dir(langPath_);
  37. QStringList fileNames = dir.entryList(QStringList("re-typeset_*.qm"));
  38. if( fileNames.size() == 0 ) {