Skip to content

Commit 36ef5e6

Browse files
committed
Merge pull request #2 from mikepkes/IEInstall
Ie install
2 parents 09dc369 + 0f9aa69 commit 36ef5e6

File tree

5 files changed

+66
-4
lines changed

5 files changed

+66
-4
lines changed

.gitignore

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
*.pyc
2+
*.sw?
3+
*.qrc
4+
*.sconsign.dblite

README.md

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,3 +2,9 @@ xcorder
22
=======
33

44
X Window Recording Tool
5+
6+
ffmpeg configuration
7+
--------------------
8+
The ffmpeg configuration requires the following for xcorder to work properly:
9+
> --extra-libs=-lasound
10+
> --enable-x11grab

SConstruct

Lines changed: 48 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,48 @@
1+
import glob
2+
import os
3+
4+
import IEEnv
5+
6+
import VersionControl
7+
VersionControl.setVersion('IEBuild', '6.15.1')
8+
import IEBuild
9+
10+
majorVersion = '0'
11+
minorVersion = '0'
12+
patchVersion = '1'
13+
14+
versionParts = {'major':majorVersion, 'minor':minorVersion, 'patch':patchVersion}
15+
version = '{major}.{minor}.{patch}'.format(**versionParts)
16+
17+
application = 'xcorder'
18+
19+
if "INSTALLPREFIX" not in ARGUMENTS:
20+
if ARGUMENTS.get("RELEASE", "0") == "1" :
21+
ARGUMENTS["INSTALLPREFIX"] = "{root}/apps/{application}/{version}/".format(
22+
root=IEEnv.Environment.rootPath(),
23+
application=application,
24+
version=version,
25+
)
26+
else:
27+
ARGUMENTS["INSTALLPREFIX"] = "{home}/apps/{application}/{version}/".format(
28+
home=os.path.expanduser("~"),
29+
application=application,
30+
version=version,
31+
)
32+
else:
33+
ARGUMENTS["INSTALLPREFIX"] = "{prefix}/apps/{application}/{version}/".format(
34+
prefix=ARGUMENTS["INSTALLPREFIX"],
35+
application=application,
36+
version=version,
37+
)
38+
39+
program = IEBuild.Buildable(
40+
ARGUMENTS,
41+
)
42+
env = program.finalize()
43+
44+
source = []
45+
for pattern in ['*.py', '*.svg', '*.qss', 'README.*', '*LICENSE*', 'xcorder']:
46+
env.Install(ARGUMENTS['INSTALLPREFIX'], glob.glob(pattern))
47+
48+
env.Alias('install', ARGUMENTS['INSTALLPREFIX'])

gui.py

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,8 @@
1717
from exporter import Exporter
1818
from recorder import Recorder
1919

20+
scriptDir = os.path.dirname(os.path.realpath(__file__))
21+
2022
# =============================================================================
2123
# CLASSES
2224
# =============================================================================
@@ -58,7 +60,7 @@ def resetToDefault(self):
5860
self.populateVideoComboBox()
5961
self.populateAudioComboBox()
6062

61-
self.recordPushButton.setIcon(QtGui.QIcon('rec_btn_off.svg'))
63+
self.recordPushButton.setIcon(QtGui.QIcon(os.path.join(scriptDir, 'rec_btn_off.svg')))
6264
self.recordPushButton.setChecked(False)
6365
self.recordPushButton.setEnabled(False)
6466

@@ -106,13 +108,13 @@ def recordClicked(self):
106108
if self.recordPushButton.isChecked():
107109
self.videoComboBox.setEnabled(False)
108110
self.audioComboBox.setEnabled(False)
109-
self.recordPushButton.setIcon(QtGui.QIcon('rec_btn_on.svg'))
111+
self.recordPushButton.setIcon(QtGui.QIcon(os.path.join(scriptDir, 'rec_btn_on.svg')))
110112

111113
self.startRecorder()
112114
else:
113115
self.videoComboBox.setEnabled(True)
114116
self.audioComboBox.setEnabled(True)
115-
self.recordPushButton.setIcon(QtGui.QIcon('rec_btn_off.svg'))
117+
self.recordPushButton.setIcon(QtGui.QIcon(os.path.join(scriptDir, 'rec_btn_off.svg')))
116118

117119
self.stopRecorder()
118120

xcorder

100644100755
Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@
1010
# =============================================================================
1111
# IMPORTS
1212
# =============================================================================
13+
import os
1314
import sys
1415
from PyQt4 import QtGui
1516
from gui import Gui
@@ -22,7 +23,8 @@ def main():
2223
app = QtGui.QApplication(sys.argv)
2324
app.setApplicationName('xcorder')
2425

25-
with open('stylesheet.qss', 'r') as file_:
26+
scriptDir = os.path.dirname(os.path.realpath(__file__))
27+
with open(os.path.join(scriptDir ,'stylesheet.qss'), 'r') as file_:
2628
app.setStyleSheet(file_.read())
2729

2830
gui = Gui()

0 commit comments

Comments
 (0)