Skip to content

Commit

Permalink
Migrate to PyQt5
Browse files Browse the repository at this point in the history
  • Loading branch information
DMaiorino committed Sep 9, 2017
1 parent e69b1e6 commit 7d3d9c0
Show file tree
Hide file tree
Showing 8 changed files with 25 additions and 17 deletions.
Binary file modified changelog.Debian.gz
Binary file not shown.
6 changes: 6 additions & 0 deletions debian/changelog
Original file line number Diff line number Diff line change
@@ -1,3 +1,9 @@
tz-converter (1.0.1-1) unstable; urgency=low

* Migrate to PyQt5

-- David Maiorino <maiorinodavid@gmail.com> Sun, 3 Sep 2017 23:16:33 +0900

tz-converter (1.0.0-1) unstable; urgency=low

* Initial release (closes: #754287)
Expand Down
10 changes: 5 additions & 5 deletions debian/control
Original file line number Diff line number Diff line change
Expand Up @@ -3,25 +3,25 @@ Maintainer: David Maiorino <maiorinodavid@gmail.com>
Section: python
Priority: optional
Build-Depends:
debhelper (>= 9),
debhelper (>=10),
dh-python,
python3-all,
python3-setuptools
Standards-Version: 3.2
X-Python3-Version: >= 3.2
Standards-Version: 3.9.8
X-Python3-Version: >= 3.5
Homepage: https://github.com/DMaiorino/tz-converter

Package: tz-converter
Architecture: all
Depends:
python-dateutil,
python3-pyside,
python3-pyqt5,
python3-tz,
${misc:Depends},
${python3:Depends}
Description: Convert the time and date across time zones
This tool provides a simple interface for converting the time and date between two time zones.
Written in Python3 and using Pyside, this interface allows the user to save a
Written in Python3 and using QtPy5, this interface allows the user to save a
certain time zone and restore it after further changes. The timezone
information is taken from pytz, supplying seven different regions:
Africa, America, Asia, Australia, Europe, Pacific, and US.
2 changes: 1 addition & 1 deletion debian/py3dist-overrides
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
python_dateutil python-dateutil
python3_pyside python3-pyside
python3_qtpy python3-qtpy
python3_tz python3-tz
5 changes: 3 additions & 2 deletions scripts/tz-converter
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,9 @@ import os
icon_path = '/usr/share/tz-converter/icons'
from tz_converter import main_widget
from tz_converter import timezone_info
from PySide.QtGui import QMainWindow, QApplication, QMessageBox, QAction, qApp, QIcon, QPixmap
from PySide.QtCore import QSettings, Qt
from PyQt5.QtWidgets import QMainWindow, QApplication, QMessageBox, QAction, qApp
from PyQt5.QtGui import QIcon, QPixmap
from PyQt5.QtCore import QSettings, Qt


class TzInterface(QMainWindow):
Expand Down
4 changes: 2 additions & 2 deletions setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -11,11 +11,11 @@ def gen_data_files(*dirs):


setup(name='tz-converter',
version='1.0.0',
version='1.0.1',
description="Tool for converting the time across time zones",
long_description=("Convert the time and date across time zones\n"
"This tool provides a simple interface for converting the time and\n"
"date between two time zones. Written in Python3 and using Pyside,\n"
"date between two time zones. Written in Python3 and using PyQt5,\n"
"this interface allows the user to save a certain time zone and\n"
"restore it after further changes. The timezone information is\n"
"taken from pytz, supplying seven different regions: Africa,\n"
Expand Down
6 changes: 3 additions & 3 deletions stdeb.cfg
Original file line number Diff line number Diff line change
Expand Up @@ -3,17 +3,17 @@ Source: tz-converter
Maintainer: David Maiorino <maiorinodavid@gmail.com>
Section: python
Depends: python-dateutil
Depends3: python3-pyside, python3-tz
Depends3: python3-qtpy, python3-tz
Build-Depends:
dh-python,
python,
python3-all,
python3-setuptools
X-Python3-Version: >= 3.2
X-Python3-Version: >= 3.5
Package: python3-tz-converter
Description: Convert the time and date across time zones
This tool provides a simple interface for converting the time and date between two time zones.
Written in Python3 and using Pyside, this interface allows the user to save a
Written in Python3 and using QtPy5, this interface allows the user to save a
certain time zone and restore it after further changes. The timezone
information is taken from pytz, supplying seven different regions:
Africa, America, Asia, Australia, Europe, Pacific, and US.
9 changes: 5 additions & 4 deletions tz_converter/main_widget.py
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,10 @@
import sys
import os
icon_path = '/usr/share/tz-converter/icons'
from PySide.QtGui import QWidget, QGroupBox, QVBoxLayout, QHBoxLayout, QTimeEdit, QCalendarWidget, QComboBox, \
QPushButton, QIcon
from PySide.QtCore import QTime, QDate
from PyQt5.QtWidgets import QWidget, QGroupBox, QVBoxLayout, QHBoxLayout, QTimeEdit, QCalendarWidget, QComboBox, \
QPushButton
from PyQt5.QtGui import QIcon
from PyQt5.QtCore import QTime, QDate
from tz_converter import timezone_info
import datetime
from pytz import timezone
Expand Down Expand Up @@ -216,4 +217,4 @@ def convert_timetwo_to_timeone(self):
self.time_one_time_edit.setTime(new_time_one)

# Reconnect time one widgets
self.time_one_connect()
self.time_one_connect()

0 comments on commit 7d3d9c0

Please sign in to comment.