Revert "moved all resource files to "ui" directory"

This reverts commit 8c7f3fd930.
This commit is contained in:
2016-03-01 11:56:43 +03:00
parent 8c7f3fd930
commit 9c5033ee2e
8 changed files with 3111 additions and 3114 deletions

View File

@@ -20,7 +20,7 @@
<string>Photo Frame</string>
</property>
<property name="windowIcon">
<iconset resource="resources.qrc">
<iconset resource="../resources.qrc">
<normaloff>:/icons/dummy.png</normaloff>:/icons/dummy.png</iconset>
</property>
<layout class="QHBoxLayout" name="horizontalLayout">
@@ -41,7 +41,7 @@
<string/>
</property>
<property name="pixmap">
<pixmap resource="resources.qrc">:/icons/dummy.png</pixmap>
<pixmap resource="../resources.qrc">:/icons/dummy.png</pixmap>
</property>
<property name="scaledContents">
<bool>true</bool>
@@ -56,7 +56,6 @@
</layout>
</widget>
<resources>
<include location="resources.qrc"/>
<include location="../resources.qrc"/>
</resources>
<connections/>

View File

@@ -1,10 +0,0 @@
<RCC>
<qresource prefix="/">
<file>../icons/refresh.png</file>
<file>../icons/dummy.png</file>
<file>../icons/menu_quit.png</file>
<file>../icons/settings.png</file>
<file>../icons/lock.png</file>
<file>../icons/unlock.png</file>
</qresource>
</RCC>

File diff suppressed because it is too large Load Diff

View File

@@ -14,7 +14,7 @@
<string>Settings</string>
</property>
<property name="windowIcon">
<iconset resource="resources.qrc">
<iconset resource="../resources.qrc">
<normaloff>:/icons/settings.png</normaloff>:/icons/settings.png</iconset>
</property>
<widget class="QLineEdit" name="txtPath">
@@ -119,7 +119,7 @@
</widget>
</widget>
<resources>
<include location="resources.qrc"/>
<include location="../resources.qrc"/>
</resources>
<connections/>
</ui>

View File

@@ -1,49 +0,0 @@
# -*- coding: utf-8 -*-
# Form implementation generated from reading ui file 'main.ui'
#
# Created by: PyQt5 UI code generator 5.5.1
#
# WARNING! All changes made in this file will be lost!
from PyQt5 import QtCore, QtGui, QtWidgets
class Ui_PhotoFrame(object):
def setupUi(self, PhotoFrame):
PhotoFrame.setObjectName("PhotoFrame")
PhotoFrame.resize(670, 481)
sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Expanding, QtWidgets.QSizePolicy.Expanding)
sizePolicy.setHorizontalStretch(0)
sizePolicy.setVerticalStretch(0)
sizePolicy.setHeightForWidth(PhotoFrame.sizePolicy().hasHeightForWidth())
PhotoFrame.setSizePolicy(sizePolicy)
icon = QtGui.QIcon()
icon.addPixmap(QtGui.QPixmap(":/icons/dummy.png"), QtGui.QIcon.Normal, QtGui.QIcon.Off)
PhotoFrame.setWindowIcon(icon)
self.horizontalLayout = QtWidgets.QHBoxLayout(PhotoFrame)
self.horizontalLayout.setObjectName("horizontalLayout")
self.gridLayout = QtWidgets.QGridLayout()
self.gridLayout.setObjectName("gridLayout")
self.Viewer = QtWidgets.QLabel(PhotoFrame)
sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Ignored, QtWidgets.QSizePolicy.Ignored)
sizePolicy.setHorizontalStretch(0)
sizePolicy.setVerticalStretch(0)
sizePolicy.setHeightForWidth(self.Viewer.sizePolicy().hasHeightForWidth())
self.Viewer.setSizePolicy(sizePolicy)
self.Viewer.setAutoFillBackground(False)
self.Viewer.setText("")
self.Viewer.setPixmap(QtGui.QPixmap(":/icons/dummy.png"))
self.Viewer.setScaledContents(True)
self.Viewer.setAlignment(QtCore.Qt.AlignCenter)
self.Viewer.setObjectName("Viewer")
self.gridLayout.addWidget(self.Viewer, 0, 0, 1, 1)
self.horizontalLayout.addLayout(self.gridLayout)
self.retranslateUi(PhotoFrame)
QtCore.QMetaObject.connectSlotsByName(PhotoFrame)
def retranslateUi(self, PhotoFrame):
_translate = QtCore.QCoreApplication.translate
PhotoFrame.setWindowTitle(_translate("PhotoFrame", "Photo Frame"))
import resources_rc

View File

@@ -1,57 +0,0 @@
# -*- coding: utf-8 -*-
# Form implementation generated from reading ui file 'settings.ui'
#
# Created by: PyQt5 UI code generator 5.5.1
#
# WARNING! All changes made in this file will be lost!
from PyQt5 import QtCore, QtGui, QtWidgets
class Ui_Settings(object):
def setupUi(self, Settings):
Settings.setObjectName("Settings")
Settings.resize(487, 120)
icon = QtGui.QIcon()
icon.addPixmap(QtGui.QPixmap(":/icons/settings.png"), QtGui.QIcon.Normal, QtGui.QIcon.Off)
Settings.setWindowIcon(icon)
self.txtPath = QtWidgets.QLineEdit(Settings)
self.txtPath.setGeometry(QtCore.QRect(110, 10, 341, 22))
self.txtPath.setAutoFillBackground(False)
self.txtPath.setReadOnly(True)
self.txtPath.setObjectName("txtPath")
self.btnOpen = QtWidgets.QPushButton(Settings)
self.btnOpen.setGeometry(QtCore.QRect(460, 10, 21, 21))
self.btnOpen.setObjectName("btnOpen")
self.label = QtWidgets.QLabel(Settings)
self.label.setGeometry(QtCore.QRect(30, 10, 71, 21))
self.label.setObjectName("label")
self.buttonBox = QtWidgets.QDialogButtonBox(Settings)
self.buttonBox.setGeometry(QtCore.QRect(160, 90, 165, 21))
self.buttonBox.setStandardButtons(QtWidgets.QDialogButtonBox.Cancel|QtWidgets.QDialogButtonBox.Ok)
self.buttonBox.setObjectName("buttonBox")
self.label_2 = QtWidgets.QLabel(Settings)
self.label_2.setGeometry(QtCore.QRect(30, 50, 141, 21))
self.label_2.setObjectName("label_2")
self.spinUpdateInterval = QtWidgets.QSpinBox(Settings)
self.spinUpdateInterval.setGeometry(QtCore.QRect(160, 50, 51, 22))
self.spinUpdateInterval.setMinimum(1)
self.spinUpdateInterval.setMaximum(1000)
self.spinUpdateInterval.setProperty("value", 60)
self.spinUpdateInterval.setObjectName("spinUpdateInterval")
self.label_3 = QtWidgets.QLabel(Settings)
self.label_3.setGeometry(QtCore.QRect(220, 50, 56, 21))
self.label_3.setObjectName("label_3")
self.retranslateUi(Settings)
QtCore.QMetaObject.connectSlotsByName(Settings)
def retranslateUi(self, Settings):
_translate = QtCore.QCoreApplication.translate
Settings.setWindowTitle(_translate("Settings", "Settings"))
self.btnOpen.setText(_translate("Settings", "..."))
self.label.setText(_translate("Settings", "Source path"))
self.label_2.setText(_translate("Settings", "Change picture every"))
self.label_3.setText(_translate("Settings", "minutes"))
import resources_rc