Merge pull request #321 from nkait/justin-final

Add Justin TV Support
Freeseer · Apr 7, 2013 · ed64b41 · ed64b41
2 parents 5166c9c + f6786fb
commit ed64b41
Show file tree

Hide file tree

Showing 15 changed files with 2,858 additions and 1,338 deletions.
diff --git a/src/freeseer/frontend/configtool/configtool.py b/src/freeseer/frontend/configtool/configtool.py
@@ -527,6 +527,7 @@ def show_plugin_widget_dialog(self, widget):
         self.dialog = QtGui.QDialog(self)
 
         self.dialog_layout = QtGui.QVBoxLayout()
+        self.dialog_layout.setSizeConstraint(QtGui.QLayout.SetFixedSize)
         self.dialog.setLayout(self.dialog_layout)
         self.dialog_layout.addWidget(widget)
 

diff --git a/src/freeseer/frontend/qtcommon/languages/freeseer.pro b/src/freeseer/frontend/qtcommon/languages/freeseer.pro
@@ -6,7 +6,8 @@ SOURCES = ../AboutDialog.py \
           ../../reporteditor/reporteditor.py \
           ../../talkeditor/talkeditor.py \
           ../../controller/Client.py \
-          ../../controller/Server.py
+          ../../controller/Server.py \
+          ../../../plugins/output/rtmp-streaming/rtmp-streaming.py
 
 TRANSLATIONS = tr_en_US.ts \
                tr_ar_EG.ts \ 

diff --git a/src/freeseer/frontend/qtcommon/languages/tr_ar_EG.ts b/src/freeseer/frontend/qtcommon/languages/tr_ar_EG.ts
diff --git a/src/freeseer/frontend/qtcommon/languages/tr_de_DE.ts b/src/freeseer/frontend/qtcommon/languages/tr_de_DE.ts
diff --git a/src/freeseer/frontend/qtcommon/languages/tr_en_US.ts b/src/freeseer/frontend/qtcommon/languages/tr_en_US.ts
diff --git a/src/freeseer/frontend/qtcommon/languages/tr_fr_CA.ts b/src/freeseer/frontend/qtcommon/languages/tr_fr_CA.ts
diff --git a/src/freeseer/frontend/qtcommon/languages/tr_ja.ts b/src/freeseer/frontend/qtcommon/languages/tr_ja.ts
diff --git a/src/freeseer/frontend/qtcommon/languages/tr_nl_NL.ts b/src/freeseer/frontend/qtcommon/languages/tr_nl_NL.ts
diff --git a/src/freeseer/frontend/qtcommon/languages/tr_sv_SE.ts b/src/freeseer/frontend/qtcommon/languages/tr_sv_SE.ts
diff --git a/src/freeseer/frontend/qtcommon/languages/tr_zh_CN.ts b/src/freeseer/frontend/qtcommon/languages/tr_zh_CN.ts
diff --git a/src/freeseer/frontend/qtcommon/languages/tr_zh_HK.ts b/src/freeseer/frontend/qtcommon/languages/tr_zh_HK.ts
diff --git a/src/freeseer/frontend/qtcommon/resource_rc.py b/src/freeseer/frontend/qtcommon/resource_rc.py
diff --git a/src/freeseer/plugins/output/rtmp-streaming/rtmp-streaming.py b/src/freeseer/plugins/output/rtmp-streaming/rtmp-streaming.py
diff --git a/src/lib/oauth/__init.py b/src/lib/oauth/__init.py
@@ -0,0 +1 @@
+from oauth import *