Browse Source

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

This reverts commit 8c7f3fd930.
master
Rinaldus 7 years ago
parent
commit
9c5033ee2e
  1. 2
      photoframe.py
  2. 10
      resources.qrc
  3. 15988
      resources_rc.py
  4. 5
      ui/main.ui
  5. 10
      ui/resources.qrc
  6. 4
      ui/settings.ui
  7. 2
      ui_main.py
  8. 2
      ui_settings.py

2
photoframe.py

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

10
resources.qrc

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

15988
ui/resources_rc.py → resources_rc.py

File diff suppressed because it is too large Load Diff

5
ui/main.ui

@ -20,7 +20,7 @@ @@ -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 @@ @@ -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 @@ @@ -56,7 +56,6 @@
</layout>
</widget>
<resources>
<include location="resources.qrc"/>
<include location="../resources.qrc"/>
</resources>
<connections/>

10
ui/resources.qrc

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

@ -14,7 +14,7 @@ @@ -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 @@ @@ -119,7 +119,7 @@
</widget>
</widget>
<resources>
<include location="resources.qrc"/>
<include location="../resources.qrc"/>
</resources>
<connections/>
</ui>

2
ui/ui_main.py → ui_main.py

@ -1,6 +1,6 @@ @@ -1,6 +1,6 @@
# -*- 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
#

2
ui/ui_settings.py → ui_settings.py

@ -1,6 +1,6 @@ @@ -1,6 +1,6 @@
# -*- 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
#
Loading…
Cancel
Save