Final tweaks for MacOSX distribution builds

highperformancecoder · May 31, 2017 · 32f7779 · 32f7779
1 parent e076cfd
commit 32f7779
Show file tree

Hide file tree

Showing 9 changed files with 219 additions and 218 deletions.
diff --git a/config.pri b/config.pri
@@ -39,7 +39,7 @@ unix:isEmpty(PRESET) { # allow command-line argument to override settings here
 	### Link dynamically against system-wide installed libraries. Intended mainly
 	### for building Linux packages for distributions with Qwt and QwtPlot3D
 	### packages compiled against Qt4 (probably most current ones).
-	PRESET = linux_package
+	!osx_dist {PRESET = linux_package}
 
 	### Link statically as much as possible. Qwt, QwtPlot3D and MuParser are
 	### expected to be supplied in the 3rdparty folder. Python, SIP, PyQt and Qt

diff --git a/macPortsInstallPackages.sh b/macPortsInstallPackages.sh
@@ -0,0 +1 @@
+port install qt4-mac qwt qwtplot3d boost gsl py27-pyqt4 py-pyqwt py27-sip muparser
diff --git a/scidavis/translations/scidavis_cs-alt.ts b/scidavis/translations/scidavis_cs-alt.ts
@@ -1232,7 +1232,7 @@
     </message>
     <message>
         <location filename="../../libscidavis/src/ApplicationWindow.cpp" line="1487"/>
-        <location filename="../../libscidavis/src/ApplicationWindow.cpp" line="13748"/>
+        <location filename="../../libscidavis/src/ApplicationWindow.cpp" line="13754"/>
         <source>Please select a column to plot!</source>
         <translation type="unfinished">Zvolte prosím sloupec k vykreslení do grafu!</translation>
     </message>
@@ -1446,7 +1446,7 @@
         <translation type="unfinished">Popis osy X</translation>
     </message>
     <message>
-        <location filename="../../libscidavis/src/ApplicationWindow.cpp" line="13754"/>
+        <location filename="../../libscidavis/src/ApplicationWindow.cpp" line="13760"/>
         <source>Please select a Y column to plot!</source>
         <translation type="unfinished">Zvolte prosím sloupec Y pro vykreslení do grafu!</translation>
     </message>
@@ -1619,7 +1619,7 @@ Chcete pokračovat?</translation>
         <location filename="../../libscidavis/src/ApplicationWindow.cpp" line="7540"/>
         <location filename="../../libscidavis/src/ApplicationWindow.cpp" line="7542"/>
         <location filename="../../libscidavis/src/ApplicationWindow.cpp" line="12570"/>
-        <location filename="../../libscidavis/src/ApplicationWindow.cpp" line="13635"/>
+        <location filename="../../libscidavis/src/ApplicationWindow.cpp" line="13641"/>
         <source>&amp;Properties...</source>
         <translation type="unfinished">&amp;&apos;Vlastnosti...</translation>
     </message>
@@ -1665,9 +1665,9 @@ Chcete pokračovat?</translation>
         <translation type="unfinished">Automatická šířka &amp;sloupce</translation>
     </message>
     <message>
-        <location filename="../../libscidavis/src/ApplicationWindow.cpp" line="13676"/>
-        <location filename="../../libscidavis/src/ApplicationWindow.cpp" line="13694"/>
+        <location filename="../../libscidavis/src/ApplicationWindow.cpp" line="13682"/>
         <location filename="../../libscidavis/src/ApplicationWindow.cpp" line="13700"/>
+        <location filename="../../libscidavis/src/ApplicationWindow.cpp" line="13706"/>
         <source>D&amp;epends on</source>
         <translation type="unfinished">Zá&amp;visí na</translation>
     </message>
@@ -2269,12 +2269,12 @@ Různé části souboru nemusí být zobrazeny korektně.</translation>
         <translation type="unfinished">&amp;Detaily grafu...</translation>
     </message>
     <message>
-        <location filename="../../libscidavis/src/ApplicationWindow.cpp" line="13648"/>
+        <location filename="../../libscidavis/src/ApplicationWindow.cpp" line="13654"/>
         <source>D&amp;epending Graphs</source>
         <translation type="unfinished">Závislé&amp; grafy</translation>
     </message>
     <message>
-        <location filename="../../libscidavis/src/ApplicationWindow.cpp" line="13662"/>
+        <location filename="../../libscidavis/src/ApplicationWindow.cpp" line="13668"/>
         <source>D&amp;epending 3D Graphs</source>
         <translation type="unfinished">Závislé&amp; 3D-Grafy</translation>
     </message>
@@ -3336,7 +3336,7 @@ první reprezentuje funkci signálu, druhý fukci odpovědi!</translation>
     </message>
     <message>
         <location filename="../../libscidavis/src/ApplicationWindow.cpp" line="1477"/>
-        <location filename="../../libscidavis/src/ApplicationWindow.cpp" line="13760"/>
+        <location filename="../../libscidavis/src/ApplicationWindow.cpp" line="13766"/>
         <source>Please set a default X column for this table, first!</source>
         <translation type="unfinished">Zvolte nejdřív prosím výchozí X-sloupec pro tuto tabulku!</translation>
     </message>
@@ -3570,23 +3570,23 @@ první reprezentuje funkci signálu, druhý fukci odpovědi!</translation>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../libscidavis/src/ApplicationWindow.cpp" line="13720"/>
-        <location filename="../../libscidavis/src/ApplicationWindow.cpp" line="13757"/>
+        <location filename="../../libscidavis/src/ApplicationWindow.cpp" line="13726"/>
+        <location filename="../../libscidavis/src/ApplicationWindow.cpp" line="13763"/>
         <source>You need at least two columns for this operation!</source>
         <translation type="unfinished">Pro tuto operaci potřebujete alespoň dva sloupce!</translation>
     </message>
     <message>
-        <location filename="../../libscidavis/src/ApplicationWindow.cpp" line="13725"/>
+        <location filename="../../libscidavis/src/ApplicationWindow.cpp" line="13731"/>
         <source>Please select a Z column for this operation!</source>
         <translation type="unfinished">Vyberte prosím Z-sloupec pro tuto operaci!</translation>
     </message>
     <message>
-        <location filename="../../libscidavis/src/ApplicationWindow.cpp" line="13730"/>
+        <location filename="../../libscidavis/src/ApplicationWindow.cpp" line="13736"/>
         <source>You need to define a X column first!</source>
         <translation type="unfinished">Nejdřív musíte definovat X-sloupec!</translation>
     </message>
     <message>
-        <location filename="../../libscidavis/src/ApplicationWindow.cpp" line="13735"/>
+        <location filename="../../libscidavis/src/ApplicationWindow.cpp" line="13741"/>
         <source>You need to define a Y column first!</source>
         <translation type="unfinished">Nejdřív musíte definovat Y-sloupec!</translation>
     </message>
@@ -3647,14 +3647,14 @@ první reprezentuje funkci signálu, druhý fukci odpovědi!</translation>
         <location filename="../../libscidavis/src/ApplicationWindow.cpp" line="11910"/>
         <location filename="../../libscidavis/src/ApplicationWindow.cpp" line="12648"/>
         <location filename="../../libscidavis/src/ApplicationWindow.cpp" line="12658"/>
-        <location filename="../../libscidavis/src/ApplicationWindow.cpp" line="13720"/>
-        <location filename="../../libscidavis/src/ApplicationWindow.cpp" line="13725"/>
-        <location filename="../../libscidavis/src/ApplicationWindow.cpp" line="13730"/>
-        <location filename="../../libscidavis/src/ApplicationWindow.cpp" line="13735"/>
-        <location filename="../../libscidavis/src/ApplicationWindow.cpp" line="13748"/>
+        <location filename="../../libscidavis/src/ApplicationWindow.cpp" line="13726"/>
+        <location filename="../../libscidavis/src/ApplicationWindow.cpp" line="13731"/>
+        <location filename="../../libscidavis/src/ApplicationWindow.cpp" line="13736"/>
+        <location filename="../../libscidavis/src/ApplicationWindow.cpp" line="13741"/>
         <location filename="../../libscidavis/src/ApplicationWindow.cpp" line="13754"/>
-        <location filename="../../libscidavis/src/ApplicationWindow.cpp" line="13757"/>
         <location filename="../../libscidavis/src/ApplicationWindow.cpp" line="13760"/>
+        <location filename="../../libscidavis/src/ApplicationWindow.cpp" line="13763"/>
+        <location filename="../../libscidavis/src/ApplicationWindow.cpp" line="13766"/>
         <source>Error</source>
         <translation type="unfinished">Chyba</translation>
     </message>
@@ -3988,7 +3988,7 @@ první reprezentuje funkci signálu, druhý fukci odpovědi!</translation>
         <translation type="unfinished">může být jakýkoliv .sciprj, .sciprj.gz, .qti, qti.gz, .py nebo ASCII soubor</translation>
     </message>
     <message>
-        <location filename="../../libscidavis/src/ApplicationWindow.cpp" line="13851"/>
+        <location filename="../../libscidavis/src/ApplicationWindow.cpp" line="13857"/>
         <source>Undo/Redo History</source>
         <translation type="unfinished">Historie Zpět/Znovu</translation>
     </message>
@@ -9208,53 +9208,53 @@ Limity musí být v rozsahu hodnot X. Pokud neznáte maximální ani minimální
 <context>
     <name>Matrix</name>
     <message>
-        <location filename="../../libscidavis/src/Matrix.cpp" line="533"/>
+        <location filename="../../libscidavis/src/Matrix.cpp" line="538"/>
         <source>Cancel</source>
         <translation type="unfinished">Zrušit</translation>
     </message>
     <message>
-        <location filename="../../libscidavis/src/Matrix.cpp" line="305"/>
+        <location filename="../../libscidavis/src/Matrix.cpp" line="310"/>
         <source>Calculation failed, the matrix is not square!</source>
         <translation type="unfinished">Výpočet selhal, matice není čtvercová!</translation>
     </message>
     <message>
-        <location filename="../../libscidavis/src/Matrix.cpp" line="336"/>
+        <location filename="../../libscidavis/src/Matrix.cpp" line="341"/>
         <source>Inversion failed, the matrix is not square!</source>
         <translation type="unfinished">Inverze selhala, matice není čtvercová!</translation>
     </message>
     <message>
-        <location filename="../../libscidavis/src/Matrix.cpp" line="531"/>
+        <location filename="../../libscidavis/src/Matrix.cpp" line="536"/>
         <source>SciDAVis</source>
         <translation type="unfinished">SciDAVis</translation>
     </message>
     <message>
-        <location filename="../../libscidavis/src/Matrix.cpp" line="304"/>
-        <location filename="../../libscidavis/src/Matrix.cpp" line="335"/>
+        <location filename="../../libscidavis/src/Matrix.cpp" line="309"/>
+        <location filename="../../libscidavis/src/Matrix.cpp" line="340"/>
         <source>Error</source>
         <translation type="unfinished">Chyba</translation>
     </message>
     <message>
-        <location filename="../../libscidavis/src/Matrix.cpp" line="532"/>
+        <location filename="../../libscidavis/src/Matrix.cpp" line="537"/>
         <source>Do you want to hide or delete</source>
         <translation type="unfinished">Chcete skrýt nebo smazat</translation>
     </message>
     <message>
-        <location filename="../../libscidavis/src/Matrix.cpp" line="533"/>
+        <location filename="../../libscidavis/src/Matrix.cpp" line="538"/>
         <source>Delete</source>
         <translation type="unfinished">Smazat</translation>
     </message>
     <message>
-        <location filename="../../libscidavis/src/Matrix.cpp" line="533"/>
+        <location filename="../../libscidavis/src/Matrix.cpp" line="538"/>
         <source>Hide</source>
         <translation type="unfinished">Skrýt</translation>
     </message>
     <message>
-        <location filename="../../libscidavis/src/Matrix.cpp" line="725"/>
+        <location filename="../../libscidavis/src/Matrix.cpp" line="730"/>
         <source>Matrix %1</source>
         <translation type="unfinished">Matice %1</translation>
     </message>
     <message>
-        <location filename="../../libscidavis/src/Matrix.cpp" line="731"/>
+        <location filename="../../libscidavis/src/Matrix.cpp" line="736"/>
         <source>%1: apply formula to selection</source>
         <translation type="unfinished">%1: použít vzorec na výběr</translation>
     </message>