Commit 45a2b8c8 authored by Georges Khaznadar's avatar Georges Khaznadar

refreshed the debian patches

parent 11c4c9ed
changed all /usr/local paths to /usr
Index: xyscan-4.21/xyscan.pro
Index: xyscan/src/xyscanWindow.cpp
===================================================================
--- xyscan-4.21.orig/xyscan.pro
+++ xyscan-4.21/xyscan.pro
@@ -33,16 +33,16 @@ macx {
}
unix {
- INCLUDEPATH += /usr/local/include/poppler/qt5/
- INCLUDEPATH += /usr/local/include/poppler
- LIBS += -L/usr/local/lib/ -lpoppler
- LIBS += -L/usr/local/lib/ -lpoppler-qt5
+ INCLUDEPATH += /usr/include/poppler/qt5/
+ INCLUDEPATH += /usr/include/poppler
+ LIBS += -L/usr/lib/ -lpoppler
+ LIBS += -L/usr/lib/ -lpoppler-qt5
}
unix {
- documentation.path = /usr/local/share/xyscan/docs
+ documentation.path = /usr/share/xyscan/docs
documentation.files = docs/* license.txt gpl.txt
- target.path = /usr/local/bin/
+ target.path = /usr/bin/
INSTALLS += documentation
INSTALLS += target
}
Index: xyscan-4.21/src/xyscanWindow.cpp
===================================================================
--- xyscan-4.21.orig/src/xyscanWindow.cpp
+++ xyscan-4.21/src/xyscanWindow.cpp
@@ -657,7 +657,7 @@ void xyscanWindow::createHelpBrowser()
--- xyscan.orig/src/xyscanWindow.cpp
+++ xyscan/src/xyscanWindow.cpp
@@ -641,7 +641,7 @@ void xyscanWindow::createHelpBrowser()
//
// The documentation is in the docs/ directory.
// On MacOS it is the app bundle under Resources,
- // on Linux typically in /usr/local/share/xyscan.
+ // on Linux typically in /usr/share/xyscan.
// Here we go through the various options step by step.
//
@@ -678,11 +678,11 @@ void xyscanWindow::createHelpBrowser()
// 4. Linux
//
if (!dir.exists()) {
- path = "/usr/local/share/xyscan/docs";
+ path = "/usr/share/xyscan/docs";
dir.setPath(path);
}
if (!dir.exists()) {
- path = "/opt/local/share/xyscan/docs";
+ path = "/opt/share/xyscan/docs";
dir.setPath(path);
}
@@ -691,11 +691,11 @@ void xyscanWindow::createHelpBrowser()
// was found so far. More an act of desperation.
//
if (!dir.exists()) {
- path = "/usr/local/xyscan/docs";
+ path = "/usr/share/doc/xyscan/docs";
+ path = "/usr/xyscan/docs";
dir.setPath(path);
}
if (!dir.exists()) {
- path = "/opt/local/xyscan/docs";
+ path = "/opt/xyscan/docs";
dir.setPath(path);
}
if (!dir.exists()) {
added a French translation
Index: xyscan-4.21/xyscan_fr.ts
Index: xyscan/xyscan_fr.ts
===================================================================
--- /dev/null
+++ xyscan-4.21/xyscan_fr.ts
+++ xyscan/xyscan_fr.ts
@@ -0,0 +1,1230 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!DOCTYPE TS>
......@@ -1234,20 +1234,20 @@ Index: xyscan-4.21/xyscan_fr.ts
+ </message>
+</context>
+</TS>
Index: xyscan-4.21/xyscan.pro
Index: xyscan/xyscan.pro
===================================================================
--- xyscan-4.21.orig/xyscan.pro
+++ xyscan-4.21/xyscan.pro
@@ -64,4 +64,4 @@ SOURCES = ./src/xyscanMain.cpp \
./src/xyscanUpdater.cpp \
./src/xyscanGraphicsView.cpp
--- xyscan.orig/xyscan.pro
+++ xyscan/xyscan.pro
@@ -108,4 +108,4 @@ SOURCES = ./src/xyscanMain.cpp \
./src/xyscanGraphicsView.cpp \
./src/xyscanDataTable.cpp
-# TRANSLATIONS = xyscan_fr.ts
+TRANSLATIONS = xyscan_fr.ts
Index: xyscan-4.21/src/xyscanMain.cpp
Index: xyscan/src/xyscanMain.cpp
===================================================================
--- xyscan-4.21.orig/src/xyscanMain.cpp
+++ xyscan-4.21/src/xyscanMain.cpp
--- xyscan.orig/src/xyscanMain.cpp
+++ xyscan/src/xyscanMain.cpp
@@ -12,6 +12,7 @@
//-----------------------------------------------------------------------------
#include <QtGui>
......@@ -1256,10 +1256,10 @@ Index: xyscan-4.21/src/xyscanMain.cpp
#include <iostream>
#include <QString>
#include <QFileInfo>
@@ -41,6 +42,13 @@ int main(int argc, char *argv[])
if (QGuiApplication::primaryScreen()->devicePixelRatio() > 1)
@@ -42,6 +43,14 @@ int main(int argc, char *argv[])
app.setAttribute(Qt::AA_UseHighDpiPixmaps);
#endif
+
+ // translation stuff
+ QTranslator translator;
......@@ -1267,25 +1267,7 @@ Index: xyscan-4.21/src/xyscanMain.cpp
+ QLibraryInfo::location(QLibraryInfo::TranslationsPath)
+ );
+ app.installTranslator(&translator);
+
//
// Create and launch xyscan
Index: xyscan-4.21/src/xyscanWindow.cpp
===================================================================
--- xyscan-4.21.orig/src/xyscanWindow.cpp
+++ xyscan-4.21/src/xyscanWindow.cpp
@@ -923,10 +923,10 @@ void xyscanWindow::createToolBox()
mErrorScanModeItem = new QWidget();
mCoordinatesItem = new QWidget();
- mToolBox->addItem(mPlotAdjustmentItem, QStringLiteral("Plot Adjustment"));
- mToolBox->addItem(mAxisSettingsItem, QStringLiteral("Axis Settings"));
- mToolBox->addItem(mErrorScanModeItem, QStringLiteral("Error Scan Mode"));
- mToolBox->addItem(mCoordinatesItem, QStringLiteral("Coordinates"));
+ mToolBox->addItem(mPlotAdjustmentItem, tr("Plot Adjustment"));
+ mToolBox->addItem(mAxisSettingsItem, tr("Axis Settings"));
+ mToolBox->addItem(mErrorScanModeItem, tr("Error Scan Mode"));
+ mToolBox->addItem(mCoordinatesItem, tr("Coordinates"));
mToolBox->setCurrentIndex(1);
//
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment