Skip to content

Change from Qt to PyQt5 #3

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
CaptainStabs wants to merge 1 commit into
base: pyqt5-ver
Choose a base branch
from
Open

Change from Qt to PyQt5 #3

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions doltk.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
from doltpy.cli import Dolt
from Qt import QtWidgets, QtCompat, QtCore, QtGui
from PyQt5 import QtWidgets, QtCore, QtGui, uic

import os
import sys
Expand Down Expand Up @@ -47,7 +47,7 @@ def __init__(self):

# Load UI
app = QtWidgets.QApplication(sys.argv)
self.ui = QtCompat.loadUi('ui/mainwindow.ui')
self.ui = uic.loadUi('ui/mainwindow.ui')

# Create commit history model
self.commit_views = [
Expand Down
2 changes: 1 addition & 1 deletion models/commit_history_model.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
from Qt import QtCore, QtGui
from PyQt5 import QtCore, QtGui


class CommitHistoryModel(QtCore.QAbstractTableModel):
Expand Down
2 changes: 1 addition & 1 deletion models/diff_model.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
from doltpy.cli.read import read_table_sql
from Qt import QtCore, QtGui
from PyQt5 import QtCore, QtGui

import pandas as pd
import pandasql as ps
Expand Down