Skip to content

Commit

Permalink
Merge pull request #289 from Palakis/linux-macos-settings-fix
Browse files Browse the repository at this point in the history 
Linux + macOS: fix height of settings window
  • Loading branch information
@Palakis
Palakis committed Mar 12, 2019
2 parents 7085f15 + d15ff5e commit 19b79ba
Show file tree
Hide file tree
Showing 4 changed files with 85 additions and 30 deletions.
2 changes: 1 addition & 1 deletion data/locale/fr-FR.ini
View file
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ NDIPlugin.OutputSettings.DialogTitle="Configuration des sorties NDI™"
NDIPlugin.OutputSettings.GroupBox.Main="Sortie principale"
NDIPlugin.OutputSettings.GroupBox.Preview="Sortie de prévisualisation"
NDIPlugin.OutputSettings.Main.Name="Nom NDI™"
NDIPlugin.OutputSettings.Preview.Name="Preview Output name"
NDIPlugin.OutputSettings.Preview.Name="Nom NDI™"
NDIPlugin.FilterName="Sortie NDI™ dédiée"
NDIPlugin.AudioFilterName="Sortie NDI™ dédiée (Audio seul)"
NDIPlugin.PremultipliedAlphaFilterName="obs-ndi - Correction du compositing alpha"
Expand Down
2 changes: 2 additions & 0 deletions src/forms/output-settings.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,8 @@ OutputSettings::OutputSettings(QWidget *parent) :
ui->setupUi(this);
connect(ui->buttonBox, SIGNAL(accepted()),
this, SLOT(onFormAccepted()));

ui->ndiVersionLabel->setText(ndiLib->NDIlib_version());
}

void OutputSettings::onFormAccepted() {
Expand Down
109 changes: 81 additions & 28 deletions src/forms/output-settings.ui
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,31 +2,34 @@
<ui version="4.0">
<class>OutputSettings</class>
<widget class="QDialog" name="OutputSettings">
<property name="windowModality">
<enum>Qt::WindowModal</enum>
</property>
<property name="geometry">
<rect>
<x>0</x>
<y>0</y>
<width>470</width>
<height>179</height>
<height>187</height>
</rect>
</property>
<property name="minimumSize">
<size>
<width>0</width>
<height>179</height>
<height>187</height>
</size>
</property>
<property name="maximumSize">
<size>
<width>16777215</width>
<height>179</height>
<height>220</height>
</size>
</property>
<property name="windowTitle">
<string>NDIPlugin.OutputSettings.DialogTitle</string>
</property>
<layout class="QGridLayout" name="gridLayout">
<item row="2" column="0">
<item row="3" column="0">
<widget class="QDialogButtonBox" name="buttonBox">
<property name="orientation">
<enum>Qt::Horizontal</enum>
Expand All @@ -36,8 +39,32 @@
</property>
</widget>
</item>
<item row="2" column="0">
<widget class="QLabel" name="ndiVersionLabel">
<property name="font">
<font>
<pointsize>8</pointsize>
</font>
</property>
<property name="text">
<string>Unknown NDI version</string>
</property>
</widget>
</item>
<item row="1" column="0">
<widget class="QGroupBox" name="previewOutputGroupBox">
<property name="sizePolicy">
<sizepolicy hsizetype="Preferred" vsizetype="Fixed">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="minimumSize">
<size>
<width>0</width>
<height>0</height>
</size>
</property>
<property name="title">
<string>NDIPlugin.OutputSettings.GroupBox.Preview</string>
</property>
Expand All @@ -54,24 +81,43 @@
<bool>false</bool>
</property>
<layout class="QFormLayout" name="formLayout_5">
<item row="0" column="0">
<layout class="QFormLayout" name="formLayout_4"/>
</item>
<item row="1" column="0">
<widget class="QLabel" name="previewOutputNameLabel">
<property name="text">
<string>NDIPlugin.OutputSettings.Preview.Name</string>
</property>
</widget>
</item>
<item row="1" column="1">
<widget class="QLineEdit" name="previewOutputName"/>
<item row="0" column="0" colspan="2">
<layout class="QFormLayout" name="formLayout_4">
<item row="0" column="0">
<widget class="QLabel" name="previewOutputNameLabel">
<property name="minimumSize">
<size>
<width>200</width>
<height>0</height>
</size>
</property>
<property name="maximumSize">
<size>
<width>16777215</width>
<height>16777215</height>
</size>
</property>
<property name="text">
<string>NDIPlugin.OutputSettings.Preview.Name</string>
</property>
</widget>
</item>
<item row="0" column="1">
<widget class="QLineEdit" name="previewOutputName"/>
</item>
</layout>
</item>
</layout>
</widget>
</item>
<item row="0" column="0">
<widget class="QGroupBox" name="mainOutputGroupBox">
<property name="sizePolicy">
<sizepolicy hsizetype="Preferred" vsizetype="Fixed">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="title">
<string>NDIPlugin.OutputSettings.GroupBox.Main</string>
</property>
Expand All @@ -82,18 +128,25 @@
<bool>false</bool>
</property>
<layout class="QFormLayout" name="formLayout_3">
<item row="0" column="0">
<layout class="QFormLayout" name="formLayout_2"/>
</item>
<item row="1" column="1">
<widget class="QLineEdit" name="mainOutputName"/>
</item>
<item row="1" column="0">
<widget class="QLabel" name="mainOutputNameLabel">
<property name="text">
<string>NDIPlugin.OutputSettings.Main.Name</string>
</property>
</widget>
<item row="0" column="0" colspan="2">
<layout class="QFormLayout" name="formLayout_2">
<item row="0" column="0">
<widget class="QLabel" name="mainOutputNameLabel">
<property name="minimumSize">
<size>
<width>200</width>
<height>0</height>
</size>
</property>
<property name="text">
<string>NDIPlugin.OutputSettings.Main.Name</string>
</property>
</widget>
</item>
<item row="0" column="1">
<widget class="QLineEdit" name="mainOutputName"/>
</item>
</layout>
</item>
</layout>
</widget>
Expand Down
2 changes: 1 addition & 1 deletion src/obs-ndi.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -105,7 +105,7 @@ bool obs_module_load(void)
return false;
}

blog(LOG_INFO, "NDI library initialized successfully");
blog(LOG_INFO, "NDI library initialized successfully (%s)", ndiLib->NDIlib_version());

NDIlib_find_create_t find_desc = {0};
find_desc.show_local_sources = true;
Expand Down

0 comments on commit 19b79ba

Please sign in to comment.