Skip to content

Commit

Permalink
adds missing imports for PyQt5
Browse files Browse the repository at this point in the history
  • Loading branch information
@myTonino
myTonino committed Aug 11, 2015
1 parent 80bae2f commit 420ca54
Show file tree
Hide file tree
Showing 6 changed files with 227 additions and 227 deletions.
4 changes: 2 additions & 2 deletions lib/main.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -53,8 +53,8 @@
from PyQt4.QtCore import (QProcess, QTimer, QSettings, QLocale, QTranslator, QDir, QFileInfo, QEvent, Qt, pyqtSignal)
else:
# PyQt5:
from PyQt5.QtWidgets import (QApplication, QMainWindow, QDialog, QMessageBox, QAction, QFileDialog, )
from PyQt5.QtGui import (QIcon,QFont,QColor)
from PyQt5.QtWidgets import (QApplication, QMainWindow, QDialog, QMessageBox, QAction, QFileDialog, QProgressDialog, QDialogButtonBox)
from PyQt5.QtGui import (QIcon, QFont, QColor)
from PyQt5.QtCore import (QProcess, QTimer, QSettings, QLocale, QTranslator, QDir, QFileInfo, QEvent, Qt, pyqtSignal, QItemSelection, QItemSelectionModel)


Expand Down
90 changes: 45 additions & 45 deletions translations/tonino_de.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,12 +3,12 @@
<context>
<name>Dialog</name>
<message>
<location filename="../uic/AboutDialogUI.py" line="75"/>
<location filename="../uic/AboutDialogUI.py" line="88"/>
<source>Tonino</source>
<translation></translation>
</message>
<message>
<location filename="../uic/AboutDialogUI.py" line="78"/>
<location filename="../uic/AboutDialogUI.py" line="91"/>
<source>OK</source>
<translation></translation>
</message>
Expand All @@ -33,7 +33,7 @@
<translation>Wollen Sie auf Version %s aktualisieren?</translation>
</message>
<message>
<location filename="../uic/AboutDialogUI.py" line="76"/>
<location filename="../uic/AboutDialogUI.py" line="89"/>
<source>Version</source>
<translation></translation>
</message>
Expand All @@ -53,17 +53,17 @@
<translation>Die Tonino Firmware ist veraltet!</translation>
</message>
<message>
<location filename="../uic/CalibDialogUI.py" line="79"/>
<location filename="../uic/CalibDialogUI.py" line="92"/>
<source>Scan</source>
<translation>Messen</translation>
</message>
<message>
<location filename="../uic/CalibDialogUI.py" line="78"/>
<location filename="../uic/CalibDialogUI.py" line="91"/>
<source>Calibration</source>
<translation>Kalibrierung</translation>
</message>
<message>
<location filename="../uic/AboutDialogUI.py" line="77"/>
<location filename="../uic/AboutDialogUI.py" line="90"/>
<source>Copyright &#xc2;&#xa9; 2014 Marko Luther, Paul Holleis</source>
<translation></translation>
</message>
Expand Down Expand Up @@ -114,97 +114,97 @@
<context>
<name>MainWindow</name>
<message>
<location filename="../uic/MainWindowUI.py" line="327"/>
<location filename="../uic/MainWindowUI.py" line="340"/>
<source>Tonino</source>
<translation></translation>
</message>
<message>
<location filename="../uic/MainWindowUI.py" line="334"/>
<location filename="../uic/MainWindowUI.py" line="347"/>
<source>Clear</source>
<translation>Zurücksetzen</translation>
</message>
<message>
<location filename="../uic/MainWindowUI.py" line="332"/>
<location filename="../uic/MainWindowUI.py" line="345"/>
<source>Delete</source>
<translation>Löschen</translation>
</message>
<message>
<location filename="../uic/MainWindowUI.py" line="331"/>
<location filename="../uic/MainWindowUI.py" line="344"/>
<source>Add</source>
<translation>Hinzufügen</translation>
</message>
<message>
<location filename="../uic/MainWindowUI.py" line="337"/>
<location filename="../uic/MainWindowUI.py" line="350"/>
<source>3 </source>
<translation></translation>
</message>
<message>
<location filename="../uic/MainWindowUI.py" line="339"/>
<location filename="../uic/MainWindowUI.py" line="352"/>
<source>Upload</source>
<translation>Übertragen</translation>
</message>
<message>
<location filename="../uic/MainWindowUI.py" line="340"/>
<location filename="../uic/MainWindowUI.py" line="353"/>
<source>File</source>
<translation>Ablage</translation>
</message>
<message>
<location filename="../uic/MainWindowUI.py" line="341"/>
<location filename="../uic/MainWindowUI.py" line="354"/>
<source>Open Recent</source>
<translation>Benutzte Skalen</translation>
</message>
<message>
<location filename="../uic/MainWindowUI.py" line="351"/>
<location filename="../uic/MainWindowUI.py" line="364"/>
<source>Help</source>
<translation>Hilfe</translation>
</message>
<message>
<location filename="../uic/MainWindowUI.py" line="345"/>
<location filename="../uic/MainWindowUI.py" line="358"/>
<source>Open...</source>
<translation>Öffnen...</translation>
</message>
<message>
<location filename="../uic/MainWindowUI.py" line="346"/>
<location filename="../uic/MainWindowUI.py" line="359"/>
<source>Ctrl+O</source>
<translation></translation>
</message>
<message>
<location filename="../uic/MainWindowUI.py" line="347"/>
<location filename="../uic/MainWindowUI.py" line="360"/>
<source>Save</source>
<translation>Speichern</translation>
</message>
<message>
<location filename="../uic/MainWindowUI.py" line="348"/>
<location filename="../uic/MainWindowUI.py" line="361"/>
<source>Ctrl+S</source>
<translation></translation>
</message>
<message>
<location filename="../uic/MainWindowUI.py" line="349"/>
<location filename="../uic/MainWindowUI.py" line="362"/>
<source>Save As...</source>
<translation>Speichern unter...</translation>
</message>
<message>
<location filename="../uic/MainWindowUI.py" line="350"/>
<location filename="../uic/MainWindowUI.py" line="363"/>
<source>Ctrl+Shift+S</source>
<translation></translation>
</message>
<message>
<location filename="../uic/MainWindowUI.py" line="352"/>
<location filename="../uic/MainWindowUI.py" line="365"/>
<source>Ctrl+?</source>
<translation></translation>
</message>
<message>
<location filename="../uic/MainWindowUI.py" line="353"/>
<location filename="../uic/MainWindowUI.py" line="366"/>
<source>About</source>
<translation>Über</translation>
</message>
<message>
<location filename="../uic/MainWindowUI.py" line="354"/>
<location filename="../uic/MainWindowUI.py" line="367"/>
<source>About Qt</source>
<translation>Über Qt</translation>
</message>
<message>
<location filename="../uic/MainWindowUI.py" line="355"/>
<location filename="../uic/MainWindowUI.py" line="368"/>
<source>Settings</source>
<translation>Einstellungen</translation>
</message>
Expand All @@ -224,82 +224,82 @@
<translation>löschen</translation>
</message>
<message>
<location filename="../uic/MainWindowUI.py" line="338"/>
<location filename="../uic/MainWindowUI.py" line="351"/>
<source>Defaults</source>
<translation>Werkseinstellung</translation>
</message>
<message>
<location filename="../uic/MainWindowUI.py" line="356"/>
<location filename="../uic/MainWindowUI.py" line="369"/>
<source>Cut</source>
<translation>Ausschneiden</translation>
</message>
<message>
<location filename="../uic/MainWindowUI.py" line="357"/>
<location filename="../uic/MainWindowUI.py" line="370"/>
<source>Ctrl+X</source>
<translation></translation>
</message>
<message>
<location filename="../uic/MainWindowUI.py" line="358"/>
<location filename="../uic/MainWindowUI.py" line="371"/>
<source>Copy</source>
<translation>Kopieren</translation>
</message>
<message>
<location filename="../uic/MainWindowUI.py" line="359"/>
<location filename="../uic/MainWindowUI.py" line="372"/>
<source>Ctrl+C</source>
<translation></translation>
</message>
<message>
<location filename="../uic/MainWindowUI.py" line="360"/>
<location filename="../uic/MainWindowUI.py" line="373"/>
<source>Paste</source>
<translation>Einfügen</translation>
</message>
<message>
<location filename="../uic/MainWindowUI.py" line="361"/>
<location filename="../uic/MainWindowUI.py" line="374"/>
<source>Ctrl+V</source>
<translation></translation>
</message>
<message>
<location filename="../uic/MainWindowUI.py" line="344"/>
<location filename="../uic/MainWindowUI.py" line="357"/>
<source> Edit</source>
<translation> Bearbeiten</translation>
</message>
<message>
<location filename="../uic/MainWindowUI.py" line="342"/>
<location filename="../uic/MainWindowUI.py" line="355"/>
<source>Apply Recent</source>
<translation>Benutzte Skalen</translation>
</message>
<message>
<location filename="../uic/MainWindowUI.py" line="362"/>
<location filename="../uic/MainWindowUI.py" line="375"/>
<source>Apply...</source>
<translation>Anwenden...</translation>
</message>
<message>
<location filename="../uic/MainWindowUI.py" line="335"/>
<location filename="../uic/MainWindowUI.py" line="348"/>
<source>Calibrate</source>
<translation>Kalibrieren</translation>
</message>
<message>
<location filename="../uic/MainWindowUI.py" line="333"/>
<location filename="../uic/MainWindowUI.py" line="346"/>
<source>Sort</source>
<translation>Sortieren</translation>
</message>
<message>
<location filename="../uic/MainWindowUI.py" line="336"/>
<location filename="../uic/MainWindowUI.py" line="349"/>
<source>0</source>
<translation></translation>
</message>
<message>
<location filename="../uic/MainWindowUI.py" line="328"/>
<location filename="../uic/MainWindowUI.py" line="341"/>
<source>AVG</source>
<translation></translation>
</message>
<message>
<location filename="../uic/MainWindowUI.py" line="329"/>
<location filename="../uic/MainWindowUI.py" line="342"/>
<source>STDEV</source>
<translation></translation>
</message>
<message>
<location filename="../uic/MainWindowUI.py" line="330"/>
<location filename="../uic/MainWindowUI.py" line="343"/>
<source>CONF95%</source>
<translation></translation>
</message>
Expand Down Expand Up @@ -395,22 +395,22 @@
<context>
<name>Preferences</name>
<message>
<location filename="../uic/PreferencesDialogUI.py" line="76"/>
<location filename="../uic/PreferencesDialogUI.py" line="89"/>
<source>Preferences</source>
<translation>Einstellungen</translation>
</message>
<message>
<location filename="../uic/PreferencesDialogUI.py" line="77"/>
<location filename="../uic/PreferencesDialogUI.py" line="90"/>
<source>Tonino Display</source>
<translation>Tonino Anzeige</translation>
</message>
<message>
<location filename="../uic/PreferencesDialogUI.py" line="78"/>
<location filename="../uic/PreferencesDialogUI.py" line="91"/>
<source>dim</source>
<translation>dunkel</translation>
</message>
<message>
<location filename="../uic/PreferencesDialogUI.py" line="79"/>
<location filename="../uic/PreferencesDialogUI.py" line="92"/>
<source>bright</source>
<translation>hell</translation>
</message>
Expand Down
Loading

0 comments on commit 420ca54

Please sign in to comment.