Changes to make the UI similar on MacOS and Windows.

This commit is contained in:
cygnusx 2021-12-28 08:43:01 +01:00
parent d6f7186fc8
commit 1523dfb764
2 changed files with 98 additions and 68 deletions

View file

@ -18,7 +18,7 @@ class Ui_MainWindow(object):
if not MainWindow.objectName():
MainWindow.setObjectName(u"MainWindow")
MainWindow.setWindowModality(Qt.NonModal)
MainWindow.resize(746, 420)
MainWindow.resize(746, 600)
sizePolicy = QSizePolicy(QSizePolicy.Fixed, QSizePolicy.MinimumExpanding)
sizePolicy.setHorizontalStretch(0)
sizePolicy.setVerticalStretch(0)
@ -61,15 +61,15 @@ class Ui_MainWindow(object):
self.line.setFrameShadow(QFrame.Sunken)
self.logBox = QPlainTextEdit(self.centralwidget)
self.logBox.setObjectName(u"logBox")
self.logBox.setGeometry(QRect(12, 401, 722, 163))
self.logBox.setGeometry(QRect(12, 401, 722, 186))
self.logBox.setMinimumSize(QSize(722, 0))
self.logBox.setMaximumSize(QSize(722, 163))
self.logBox.setMaximumSize(QSize(722, 186))
self.logBox.setStyleSheet(u"")
self.logBox.setReadOnly(True)
self.logBox.setProperty("hidden", False)
self.layoutWidget2 = QWidget(self.centralwidget)
self.layoutWidget2.setObjectName(u"layoutWidget2")
self.layoutWidget2.setGeometry(QRect(12, 184, 721, 135))
self.layoutWidget2.setGeometry(QRect(12, 184, 721, 141))
self.horizontalLayout_2 = QHBoxLayout(self.layoutWidget2)
self.horizontalLayout_2.setSpacing(10)
self.horizontalLayout_2.setObjectName(u"horizontalLayout_2")
@ -115,6 +115,9 @@ class Ui_MainWindow(object):
self.debugBtn.setObjectName(u"debugBtn")
sizePolicy1.setHeightForWidth(self.debugBtn.sizePolicy().hasHeightForWidth())
self.debugBtn.setSizePolicy(sizePolicy1)
self.debugBtn.setMinimumSize(QSize(110, 0))
self.debugBtn.setAutoDefault(False)
self.debugBtn.setFlat(False)
self.horizontalLayout_4.addWidget(self.debugBtn)
@ -150,28 +153,27 @@ class Ui_MainWindow(object):
self.title = QLabel(self.centralwidget)
self.title.setObjectName(u"title")
self.title.setEnabled(True)
self.title.setGeometry(QRect(14, 9, 118, 20))
self.title.setGeometry(QRect(14, 10, 231, 24))
sizePolicy1.setHeightForWidth(self.title.sizePolicy().hasHeightForWidth())
self.title.setSizePolicy(sizePolicy1)
self.title.setMinimumSize(QSize(0, 24))
self.title.setMaximumSize(QSize(16777215, 20))
font = QFont()
font.setPointSize(17)
font.setBold(False)
font.setWeight(50)
font.setStrikeOut(False)
font.setKerning(True)
font.setFamily(u"Arial")
font.setPointSize(18)
self.title.setFont(font)
self.title.setLineWidth(0)
self.title.setTextFormat(Qt.AutoText)
self.title.setScaledContents(False)
self.title.setAlignment(Qt.AlignLeading|Qt.AlignLeft|Qt.AlignTop)
self.title.setWordWrap(False)
self.title.setIndent(0)
self.status = QLabel(self.centralwidget)
self.status.setObjectName(u"status")
self.status.setGeometry(QRect(14, 40, 400, 105))
sizePolicy1.setHeightForWidth(self.status.sizePolicy().hasHeightForWidth())
self.status.setSizePolicy(sizePolicy1)
self.status.setGeometry(QRect(14, 40, 451, 111))
sizePolicy3.setHeightForWidth(self.status.sizePolicy().hasHeightForWidth())
self.status.setSizePolicy(sizePolicy3)
self.status.setMinimumSize(QSize(400, 0))
font1 = QFont()
font1.setPointSize(12)
self.status.setFont(font1)
self.status.setTextFormat(Qt.AutoText)
self.status.setScaledContents(False)
self.status.setAlignment(Qt.AlignLeading|Qt.AlignLeft|Qt.AlignTop)
@ -210,6 +212,9 @@ class Ui_MainWindow(object):
self.retranslateUi(MainWindow)
self.debugBtn.setDefault(False)
QMetaObject.connectSlotsByName(MainWindow)
# setupUi
@ -228,7 +233,7 @@ class Ui_MainWindow(object):
self.actionRead_preloader.setText(QCoreApplication.translate("MainWindow", u"Read preloader", None))
self.actionGenerate_RPMB_keys.setText(QCoreApplication.translate("MainWindow", u"Generate RPMB keys", None))
self.logoPic.setText("")
self.copyrightInfo.setText(QCoreApplication.translate("MainWindow", u"<html><head/><body><p><span style=\" font-size:12pt;\">Made by: Bjoern Kerler<br/>Gui by: Geert-Jan Kreileman<br/></span></p><p><span style=\" font-size:12pt;\">Credits:<br/> kamakiri [xyzz]<br/> linecode exploit [chimera]<br/> Chaosmaster<br/> and all contributers</span></p></body></html>", None))
self.copyrightInfo.setText(QCoreApplication.translate("MainWindow", u"<b>Made by:</b> Bjoern Kerler<br/><b>Gui by:</b> Geert-Jan Kreileman<br/><br/><b>Credits:</b><br/>kamakiri [xyzz]<br/>linecode exploit [chimera]<br/>Chaosmaster<br/>and all contributers</p>", None))
self.debugBtn.setText(QCoreApplication.translate("MainWindow", u"Show debug log", None))
self.pic.setText("")
self.phoneInfoTextbox.setText(QCoreApplication.translate("MainWindow", u"No phone detected.", None))

127
mtkclient/gui/main_gui.ui Normal file → Executable file
View file

@ -10,7 +10,7 @@
<x>0</x>
<y>0</y>
<width>746</width>
<height>420</height>
<height>600</height>
</rect>
</property>
<property name="sizePolicy">
@ -60,7 +60,7 @@
<x>12</x>
<y>401</y>
<width>722</width>
<height>163</height>
<height>186</height>
</rect>
</property>
<property name="minimumSize">
@ -72,7 +72,7 @@
<property name="maximumSize">
<size>
<width>722</width>
<height>163</height>
<height>186</height>
</size>
</property>
<property name="styleSheet">
@ -91,7 +91,7 @@
<x>12</x>
<y>184</y>
<width>721</width>
<height>135</height>
<height>141</height>
</rect>
</property>
<layout class="QHBoxLayout" name="horizontalLayout_2">
@ -141,7 +141,7 @@
</sizepolicy>
</property>
<property name="text">
<string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; font-size:12pt;&quot;&gt;Made by: Bjoern Kerler&lt;br/&gt;Gui by: Geert-Jan Kreileman&lt;br/&gt;&lt;/span&gt;&lt;/p&gt;&lt;p&gt;&lt;span style=&quot; font-size:12pt;&quot;&gt;Credits:&lt;br/&gt; kamakiri [xyzz]&lt;br/&gt; linecode exploit [chimera]&lt;br/&gt; Chaosmaster&lt;br/&gt; and all contributers&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
<string>&lt;b&gt;Made by:&lt;/b&gt; Bjoern Kerler&lt;br/&gt;&lt;b&gt;Gui by:&lt;/b&gt; Geert-Jan Kreileman&lt;br/&gt;&lt;br/&gt;&lt;b&gt;Credits:&lt;/b&gt;&lt;br/&gt;kamakiri [xyzz]&lt;br/&gt;linecode exploit [chimera]&lt;br/&gt;Chaosmaster&lt;br/&gt;and all contributers&lt;/p&gt;</string>
</property>
</widget>
</item>
@ -184,9 +184,24 @@
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="minimumSize">
<size>
<width>110</width>
<height>0</height>
</size>
</property>
<property name="text">
<string>Show debug log</string>
</property>
<property name="autoDefault">
<bool>false</bool>
</property>
<property name="default">
<bool>false</bool>
</property>
<property name="flat">
<bool>false</bool>
</property>
</widget>
</item>
</layout>
@ -294,49 +309,9 @@
<property name="geometry">
<rect>
<x>14</x>
<y>9</y>
<width>118</width>
<height>20</height>
</rect>
</property>
<property name="sizePolicy">
<sizepolicy hsizetype="Fixed" vsizetype="Fixed">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="maximumSize">
<size>
<width>16777215</width>
<height>20</height>
</size>
</property>
<property name="font">
<font>
<pointsize>17</pointsize>
<weight>50</weight>
<bold>false</bold>
<strikeout>false</strikeout>
<kerning>true</kerning>
</font>
</property>
<property name="text">
<string>MTKClient v2.0</string>
</property>
<property name="alignment">
<set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop</set>
</property>
<property name="wordWrap">
<bool>false</bool>
</property>
</widget>
<widget class="QLabel" name="status">
<property name="geometry">
<rect>
<x>14</x>
<y>40</y>
<width>400</width>
<height>105</height>
<y>10</y>
<width>231</width>
<height>24</height>
</rect>
</property>
<property name="sizePolicy">
@ -347,15 +322,65 @@
</property>
<property name="minimumSize">
<size>
<width>400</width>
<height>0</height>
<width>0</width>
<height>24</height>
</size>
</property>
<property name="maximumSize">
<size>
<width>16777215</width>
<height>20</height>
</size>
</property>
<property name="font">
<font>
<pointsize>12</pointsize>
<family>Arial</family>
<pointsize>18</pointsize>
</font>
</property>
<property name="lineWidth">
<number>0</number>
</property>
<property name="text">
<string>MTKClient v2.0</string>
</property>
<property name="textFormat">
<enum>Qt::AutoText</enum>
</property>
<property name="scaledContents">
<bool>false</bool>
</property>
<property name="alignment">
<set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop</set>
</property>
<property name="wordWrap">
<bool>false</bool>
</property>
<property name="indent">
<number>0</number>
</property>
</widget>
<widget class="QLabel" name="status">
<property name="geometry">
<rect>
<x>14</x>
<y>40</y>
<width>451</width>
<height>111</height>
</rect>
</property>
<property name="sizePolicy">
<sizepolicy hsizetype="Expanding" vsizetype="Expanding">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="minimumSize">
<size>
<width>400</width>
<height>0</height>
</size>
</property>
<property name="text">
<string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Please connect a Mediatek phone to continue.&lt;br/&gt;&lt;br/&gt;&lt;span style=&quot; font-weight:600;&quot;&gt;Hint:&lt;/span&gt; Power off the phone before connecting.&lt;br/&gt;&lt;span style=&quot; font-style:italic; color:#393939;&quot;&gt;For brom mode:&lt;/span&gt;&lt;span style=&quot; color:#393939;&quot;&gt;&lt;br/&gt;Press and hold vol up, vol dwn, or all hw buttons and connect usb.&lt;br/&gt;&lt;/span&gt;&lt;span style=&quot; font-style:italic; color:#393939;&quot;&gt;For preloader mode:&lt;/span&gt;&lt;span style=&quot; color:#393939;&quot;&gt;&lt;br/&gt;Don't press any hw button and connect usb.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
</property>