Skip to content

Commit d3c4f8a

Browse files
committed
Move openshot_rc.py to classes/
1 parent 250a43c commit d3c4f8a

File tree

4 files changed

+7
-7
lines changed

4 files changed

+7
-7
lines changed

src/classes/app.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,7 @@ def __init__(self, *args, mode=None):
8080
log.info('Starting new session'.center(48))
8181

8282
from classes import settings, project_data, updates, language, ui_util, logger_libopenshot
83-
from images import openshot_rc
83+
from . import openshot_rc
8484
import openshot
8585

8686
# Re-route stdout and stderr to logger
File renamed without changes.

src/images/Makefile

+5-5
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
1-
ALL: openshot_rc.py
1+
ALL: ../classes/openshot_rc.py
22

3-
ICONS:=$(shell /usr/bin/find Humanity/ -type f -newer openshot_rc.py)
4-
ICONS+=$(shell /usr/bin/find . -name \*-icon.png -newer openshot_rc.py)
3+
ICONS:=$(shell /usr/bin/find Humanity/ -type f -newer ../classes/openshot_rc.py)
4+
ICONS+=$(shell /usr/bin/find . -name \*-icon.png -newer ../classes/openshot_rc.py)
55
ICONS+=AboutLogo.png openshot.svg
6-
ICONS+=$(shell /usr/bin/find . -type f -name hw-accel\*.svg -newer openshot_rc.py)
6+
ICONS+=$(shell /usr/bin/find . -type f -name hw-accel\*.svg -newer ../classes/openshot_rc.py)
77

8-
openshot_rc.py: openshot.qrc $(ICONS)
8+
../classes/openshot_rc.py: openshot.qrc $(ICONS)
99
pyrcc5 openshot.qrc -o $@

src/windows/main_window.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@
5252
from classes.version import *
5353
from classes.conversion import zoomToSeconds, secondsToZoom
5454
from classes.thumbnail import httpThumbnailServerThread
55-
from images import openshot_rc
55+
from classes import openshot_rc
5656
from windows.models.files_model import FilesModel
5757
from windows.views.files_treeview import FilesTreeView
5858
from windows.views.files_listview import FilesListView

0 commit comments

Comments
 (0)