Skip to content

Commit

Permalink
added menu bar icons for windows and linux. created main.spec for win…
Browse files Browse the repository at this point in the history
…dows and linux packaging. Distributing build
  • Loading branch information
KnoBuddy committed Oct 11, 2024
1 parent 4f6c8ce commit 414d83e
Show file tree
Hide file tree
Showing 10 changed files with 65,292 additions and 496 deletions.
3 changes: 3 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,9 @@ __pycache__/

venv/

build/
dist/

*mp4
*aac
*wmv
Expand Down
5 changes: 0 additions & 5 deletions fonts.qrc

This file was deleted.

21 changes: 8 additions & 13 deletions gui.ui
Original file line number Diff line number Diff line change
Expand Up @@ -436,26 +436,21 @@
</item>
</layout>
</item>
<item row="3" column="0">
<widget class="QProgressBar" name="progressBar">
<property name="value">
<number>24</number>
</property>
</widget>
</item>
</layout>
</widget>
</item>
</layout>
</widget>
<widget class="QStatusBar" name="statusbar"/>
<widget class="QToolBar" name="toolBar">
<property name="windowTitle">
<string>toolBar</string>
</property>
<attribute name="toolBarArea">
<enum>TopToolBarArea</enum>
</attribute>
<attribute name="toolBarBreak">
<bool>false</bool>
</attribute>
</widget>
</widget>
<resources>
<include location="fonts.qrc"/>
<include location="resources.qrc"/>
</resources>
<connections/>
</ui>
5 changes: 0 additions & 5 deletions icon.qrc

This file was deleted.

Binary file added icons/videoeditor_icon.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
16 changes: 12 additions & 4 deletions main.py
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@

import sys
import os
import argparse
import platform

from moviepy.video.io.VideoFileClip import VideoFileClip
import moviepy.audio.fx.all as afx
Expand Down Expand Up @@ -40,25 +40,33 @@ class VideoEditor(QMainWindow):
def __init__(self):
super().__init__()

system = platform.system()

# Path handling for the .ui file and fonts
if hasattr(sys, '_MEIPASS'):
# Packaged environment
ui_file_path = os.path.join(sys._MEIPASS, 'gui.ui')
font_path = os.path.join(sys._MEIPASS, 'fonts', 'digital-7 (mono).ttf')
icon_path = os.path.join(sys._MEIPASS, 'windowseditor_icon.ico')
if system == 'Windows':
icon_path = os.path.join(sys._MEIPASS, 'icons', 'videoeditor_icon.ico')
else:
icon_path = os.path.join(sys._MEIPASS, 'icons', 'videoeditor_icon.png')
else:
# Development environment
ui_file_path = os.path.abspath('gui.ui')
font_path = os.path.abspath('fonts/digital-7 (mono).ttf')
icon_path = os.path.abspath('windowseditor_icon.ico')
if system == 'Windows':
icon_path = os.path.abspath('icons/videoeditor_icon.ico')
else:
icon_path = os.path.abspath('icons/videoeditor_icon.png')

loader = QUiLoader()

self.ui = loader.load(ui_file_path)
self.setCentralWidget(self.ui)
self.setFixedSize(self.ui.size())
self.setWindowTitle("Video Editor v0.0.1")
self.setWindowIcon(resources_rc(QIcon(icon_path)))
self.setWindowIcon(QIcon(icon_path))

# Attempt to load the font
font_id = QFontDatabase.addApplicationFont(font_path)
Expand Down
53 changes: 53 additions & 0 deletions main.spec
Original file line number Diff line number Diff line change
@@ -0,0 +1,53 @@
# -*- mode: python ; coding: utf-8 -*-
import sys
import platform

system = platform.system()

a = Analysis(
['main.py'],
pathex=[],
binaries=[],
datas=[
('gui.ui', '.'),
('fonts/digital-7 (mono).ttf', 'fonts'),
('icons/videoeditor_icon.ico', 'icons'),
('icons/videoeditor_icon.png', 'icons'),
],
hiddenimports=[],
hookspath=[],
hooksconfig={},
runtime_hooks=[],
excludes=[],
noarchive=False,
optimize=0,
)
pyz = PYZ(a.pure)

# Set the icon parameter conditionally based on the OS
if system == 'Windows':
icon_file = 'icons/videoeditor_icon.ico'
else:
icon_file = None

exe = EXE(
pyz,
a.scripts,
a.binaries,
a.datas,
[],
name='VideoEditor',
debug=False,
bootloader_ignore_signals=False,
strip=False,
upx=True,
upx_exclude=[],
runtime_tmpdir=None,
console=True,
disable_windowed_traceback=False,
argv_emulation=False,
target_arch=None,
codesign_identity=None,
entitlements_file=None,
icon=icon_file,
)
Loading

0 comments on commit 414d83e

Please sign in to comment.