Rinaldus
/
photoframe
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

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

This reverts commit 8c7f3fd930.
This commit is contained in:
Rinaldus 2016-03-01 11:56:43 +03:00
parent 8c7f3fd930
commit 9c5033ee2e
8 changed files with 3111 additions and 3114 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
photoframe.py
View File

@ -1,7 +1,5 @@
#!/usr/bin/env python3 #!/usr/bin/env python3
import os,sys
sys.path.append("ui")
from PyQt5.QtGui import QIcon, QMouseEvent from PyQt5.QtGui import QIcon, QMouseEvent
from PyQt5.QtWidgets import (QAction, QApplication, QCheckBox, QComboBox, from PyQt5.QtWidgets import (QAction, QApplication, QCheckBox, QComboBox,
QDialog, QGridLayout, QGroupBox, QHBoxLayout, QLabel, QLineEdit, QDialog, QGridLayout, QGroupBox, QHBoxLayout, QLabel, QLineEdit,

10
resources.qrc Normal file
View File

@ -0,0 +1,10 @@
<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>

6190
ui/resources_rc.py → resources_rc.py
View File

File diff suppressed because it is too large Load Diff

5
ui/main.ui
View File

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

10
ui/resources.qrc
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>

4
ui/settings.ui
View File

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

2
ui/ui_main.py → ui_main.py
View File

@ -1,6 +1,6 @@
# -*- coding: utf-8 -*- # -*- coding: utf-8 -*-
# Form implementation generated from reading ui file 'main.ui' # Form implementation generated from reading ui file 'ui/main.ui'
# #
# Created by: PyQt5 UI code generator 5.5.1 # Created by: PyQt5 UI code generator 5.5.1
# #

2
ui/ui_settings.py → ui_settings.py
View File

@ -1,6 +1,6 @@
# -*- coding: utf-8 -*- # -*- coding: utf-8 -*-
# Form implementation generated from reading ui file 'settings.ui' # Form implementation generated from reading ui file 'ui/settings.ui'
# #
# Created by: PyQt5 UI code generator 5.5.1 # Created by: PyQt5 UI code generator 5.5.1
# #