Members of the KDE Community are recommended to subscribe to the kde-community mailing list at https://mail.kde.org/mailman/listinfo/kde-community to allow them to participate in important discussions and receive other important announcements

Get rid of deprecated KComboBox in UI files, move audio rec config to a proper...

Get rid of deprecated KComboBox in UI files, move audio rec config to a proper tab in Kdenlive's settings
parent 55c7ca2d
Pipeline #1943 passed with stage
in 14 minutes and 56 seconds
......@@ -115,6 +115,7 @@ void Core::initGUI(const QUrl &Url)
m_currentProfile = m_profile;
profileChanged();
m_mainWindow = new MainWindow();
connect(this, &Core::showConfigDialog, m_mainWindow, &MainWindow::slotPreferences);
// load default profile and ask user to select one if not found.
if (m_profile.isEmpty()) {
......
......@@ -224,6 +224,8 @@ public slots:
signals:
void coreIsReady();
void updateLibraryPath();
/** @brief Call config dialog on a selected page / tab */
void showConfigDialog(int, int);
};
#endif
......@@ -137,8 +137,11 @@ KdenliveSettingsDialog::KdenliveSettingsDialog(QMap<QString, QString> mappable_a
QWidget *p4 = new QWidget;
m_configCapture.setupUi(p4);
// Remove ffmpeg tab, unused
m_configCapture.tabWidget->removeTab(0);
m_configCapture.tabWidget->removeTab(2);
m_configCapture.label->setVisible(false);
m_configCapture.kcfg_defaultcapture->setVisible(false);
//m_configCapture.tabWidget->removeTab(2);
#ifdef USE_V4L
// Video 4 Linux device detection
......@@ -152,9 +155,9 @@ KdenliveSettingsDialog::KdenliveSettingsDialog(QMap<QString, QString> mappable_a
}
}
}
connect(m_configCapture.kcfg_detectedv4ldevices, static_cast<void (KComboBox::*)(int)>(&KComboBox::currentIndexChanged), this,
connect(m_configCapture.kcfg_detectedv4ldevices, static_cast<void (QComboBox::*)(int)>(&QComboBox::currentIndexChanged), this,
&KdenliveSettingsDialog::slotUpdatev4lDevice);
connect(m_configCapture.kcfg_v4l_format, static_cast<void (KComboBox::*)(int)>(&KComboBox::currentIndexChanged), this,
connect(m_configCapture.kcfg_v4l_format, static_cast<void (QComboBox::*)(int)>(&QComboBox::currentIndexChanged), this,
&KdenliveSettingsDialog::slotUpdatev4lCaptureProfile);
connect(m_configCapture.config_v4l, &QAbstractButton::clicked, this, &KdenliveSettingsDialog::slotEditVideo4LinuxProfile);
......@@ -244,12 +247,12 @@ KdenliveSettingsDialog::KdenliveSettingsDialog(QMap<QString, QString> mappable_a
loadEncodingProfiles();
connect(m_configSdl.kcfg_audio_driver, static_cast<void (KComboBox::*)(int)>(&KComboBox::currentIndexChanged), this,
connect(m_configSdl.kcfg_audio_driver, static_cast<void (QComboBox::*)(int)>(&QComboBox::currentIndexChanged), this,
&KdenliveSettingsDialog::slotCheckAlsaDriver);
connect(m_configSdl.kcfg_audio_backend, static_cast<void (KComboBox::*)(int)>(&KComboBox::currentIndexChanged), this,
connect(m_configSdl.kcfg_audio_backend, static_cast<void (QComboBox::*)(int)>(&QComboBox::currentIndexChanged), this,
&KdenliveSettingsDialog::slotCheckAudioBackend);
initDevices();
connect(m_configCapture.kcfg_grab_capture_type, static_cast<void (KComboBox::*)(int)>(&KComboBox::currentIndexChanged), this,
connect(m_configCapture.kcfg_grab_capture_type, static_cast<void (QComboBox::*)(int)>(&QComboBox::currentIndexChanged), this,
&KdenliveSettingsDialog::slotUpdateGrabRegionStatus);
slotUpdateGrabRegionStatus();
......@@ -264,7 +267,7 @@ KdenliveSettingsDialog::KdenliveSettingsDialog(QMap<QString, QString> mappable_a
m_configCapture.decklink_parameters->setVisible(false);
m_configCapture.decklink_parameters->setMaximumHeight(QFontMetrics(font()).lineSpacing() * 4);
m_configCapture.decklink_parameters->setPlainText(KdenliveSettings::decklink_parameters());
connect(m_configCapture.kcfg_decklink_profile, static_cast<void (KComboBox::*)(int)>(&KComboBox::currentIndexChanged), this,
connect(m_configCapture.kcfg_decklink_profile, static_cast<void (QComboBox::*)(int)>(&QComboBox::currentIndexChanged), this,
&KdenliveSettingsDialog::slotUpdateDecklinkProfile);
connect(m_configCapture.decklink_showprofileinfo, &QAbstractButton::clicked, m_configCapture.decklink_parameters, &QWidget::setVisible);
......@@ -278,7 +281,7 @@ KdenliveSettingsDialog::KdenliveSettingsDialog(QMap<QString, QString> mappable_a
act->setData(2);
connect(act, &QAction::triggered, this, &KdenliveSettingsDialog::slotManageEncodingProfile);
m_configCapture.v4l_manageprofile->setDefaultAction(act);
connect(m_configCapture.kcfg_v4l_profile, static_cast<void (KComboBox::*)(int)>(&KComboBox::currentIndexChanged), this,
connect(m_configCapture.kcfg_v4l_profile, static_cast<void (QComboBox::*)(int)>(&QComboBox::currentIndexChanged), this,
&KdenliveSettingsDialog::slotUpdateV4lProfile);
connect(m_configCapture.v4l_showprofileinfo, &QAbstractButton::clicked, m_configCapture.v4l_parameters, &QWidget::setVisible);
......@@ -291,7 +294,7 @@ KdenliveSettingsDialog::KdenliveSettingsDialog(QMap<QString, QString> mappable_a
act->setData(3);
connect(act, &QAction::triggered, this, &KdenliveSettingsDialog::slotManageEncodingProfile);
m_configCapture.grab_manageprofile->setDefaultAction(act);
connect(m_configCapture.kcfg_grab_profile, static_cast<void (KComboBox::*)(int)>(&KComboBox::currentIndexChanged), this,
connect(m_configCapture.kcfg_grab_profile, static_cast<void (QComboBox::*)(int)>(&QComboBox::currentIndexChanged), this,
&KdenliveSettingsDialog::slotUpdateGrabProfile);
connect(m_configCapture.grab_showprofileinfo, &QAbstractButton::clicked, m_configCapture.grab_parameters, &QWidget::setVisible);
......@@ -300,7 +303,7 @@ KdenliveSettingsDialog::KdenliveSettingsDialog(QMap<QString, QString> mappable_a
act->setData(1);
connect(act, &QAction::triggered, this, &KdenliveSettingsDialog::slotManageEncodingProfile);
m_configProject.preview_manageprofile->setDefaultAction(act);
connect(m_configProject.kcfg_preview_profile, static_cast<void (KComboBox::*)(int)>(&KComboBox::currentIndexChanged), this,
connect(m_configProject.kcfg_preview_profile, static_cast<void (QComboBox::*)(int)>(&QComboBox::currentIndexChanged), this,
&KdenliveSettingsDialog::slotUpdatePreviewProfile);
connect(m_configProject.preview_showprofileinfo, &QAbstractButton::clicked, m_configProject.previewparams, &QWidget::setVisible);
m_configProject.previewparams->setVisible(false);
......@@ -328,7 +331,7 @@ KdenliveSettingsDialog::KdenliveSettingsDialog(QMap<QString, QString> mappable_a
m_configProxy.proxy_manageprofile->setDefaultAction(act);
connect(m_configProxy.proxy_showprofileinfo, &QAbstractButton::clicked, m_configProxy.proxyparams, &QWidget::setVisible);
connect(m_configProxy.kcfg_proxy_profile, static_cast<void (KComboBox::*)(int)>(&KComboBox::currentIndexChanged), this,
connect(m_configProxy.kcfg_proxy_profile, static_cast<void (QComboBox::*)(int)>(&QComboBox::currentIndexChanged), this,
&KdenliveSettingsDialog::slotUpdateProxyProfile);
slotUpdateProxyProfile(-1);
......@@ -345,6 +348,8 @@ KdenliveSettingsDialog::KdenliveSettingsDialog(QMap<QString, QString> mappable_a
// No blackmagic card found
m_configSdl.kcfg_external_display->setEnabled(false);
}
initAudioRecDevice();
// Config dialog size
KSharedConfigPtr config = KSharedConfig::openConfig();
......@@ -362,7 +367,7 @@ KdenliveSettingsDialog::KdenliveSettingsDialog(QMap<QString, QString> mappable_a
}
// static
bool KdenliveSettingsDialog::getBlackMagicDeviceList(KComboBox *devicelist, bool force)
bool KdenliveSettingsDialog::getBlackMagicDeviceList(QComboBox *devicelist, bool force)
{
if (!force && !KdenliveSettings::decklink_device_found()) {
return false;
......@@ -389,7 +394,24 @@ bool KdenliveSettingsDialog::getBlackMagicDeviceList(KComboBox *devicelist, bool
return true;
}
bool KdenliveSettingsDialog::getBlackMagicOutputDeviceList(KComboBox *devicelist, bool force)
// static
bool KdenliveSettingsDialog::initAudioRecDevice()
{
QStringList audioDevices = pCore->getAudioCaptureDevices();
m_configCapture.kcfg_defaultaudiocapture->addItems(audioDevices);
connect(m_configCapture.kcfg_defaultaudiocapture, static_cast<void (QComboBox::*)(int)>(&QComboBox::currentIndexChanged), [&]() {
QString currentDevice = m_configCapture.kcfg_defaultaudiocapture->currentText();
KdenliveSettings::setDefaultaudiocapture(currentDevice);
});
QString selectedDevice = KdenliveSettings::defaultaudiocapture();
int selectedIndex = m_configCapture.kcfg_defaultaudiocapture->findText(selectedDevice);
if (!selectedDevice.isEmpty() && selectedIndex > -1) {
m_configCapture.kcfg_defaultaudiocapture->setCurrentIndex(selectedIndex);
}
return true;
}
bool KdenliveSettingsDialog::getBlackMagicOutputDeviceList(QComboBox *devicelist, bool force)
{
if (!force && !KdenliveSettings::decklink_device_found()) {
return false;
......@@ -419,7 +441,7 @@ bool KdenliveSettingsDialog::getBlackMagicOutputDeviceList(KComboBox *devicelist
void KdenliveSettingsDialog::setupJogshuttleBtns(const QString &device)
{
QList<KComboBox *> list;
QList<QComboBox *> list;
QList<QLabel *> list1;
list << m_configShuttle.shuttle1;
......@@ -506,7 +528,7 @@ void KdenliveSettingsDialog::setupJogshuttleBtns(const QString &device)
}
int i = 0;
for (KComboBox *button : m_shuttle_buttons) {
for (QComboBox *button : m_shuttle_buttons) {
button->addItems(action_names);
connect(button, SIGNAL(activated(int)), this, SLOT(slotShuttleModified()));
++i;
......@@ -752,7 +774,7 @@ void KdenliveSettingsDialog::updateWidgets()
}
}
int i = 0;
for (KComboBox *button : m_shuttle_buttons) {
for (QComboBox *button : m_shuttle_buttons) {
++i;
if (i < actions_map.size()) {
button->setCurrentIndex(action_pos[actions_map[i]]);
......@@ -952,7 +974,7 @@ void KdenliveSettingsDialog::updateSettings()
QStringList actions;
actions << QStringLiteral("monitor_pause"); // the Job rest position action.
for (KComboBox *button : m_shuttle_buttons) {
for (QComboBox *button : m_shuttle_buttons) {
actions << m_mappable_actions[button->currentText()];
}
QString maps = JogShuttleConfig::actionMap(actions);
......@@ -1154,7 +1176,7 @@ void KdenliveSettingsDialog::slotShuttleModified()
#ifdef USE_JOGSHUTTLE
QStringList actions;
actions << QStringLiteral("monitor_pause"); // the Job rest position action.
for (KComboBox *button : m_shuttle_buttons) {
for (QComboBox *button : m_shuttle_buttons) {
actions << m_mappable_actions[button->currentText()];
}
QString maps = JogShuttleConfig::actionMap(actions);
......
......@@ -109,7 +109,7 @@ private:
bool m_modified;
bool m_shuttleModified;
QMap<QString, QString> m_mappable_actions;
QVector<KComboBox *> m_shuttle_buttons;
QVector<QComboBox *> m_shuttle_buttons;
void initDevices();
void loadTranscodeProfiles();
void saveTranscodeProfiles();
......@@ -118,8 +118,10 @@ private:
void loadEncodingProfiles();
void setupJogshuttleBtns(const QString &device);
/** @brief Fill a combobox with the found blackmagic devices */
static bool getBlackMagicDeviceList(KComboBox *devicelist, bool force = false);
static bool getBlackMagicOutputDeviceList(KComboBox *devicelist, bool force = false);
static bool getBlackMagicDeviceList(QComboBox *devicelist, bool force = false);
static bool getBlackMagicOutputDeviceList(QComboBox *devicelist, bool force = false);
/** @brief Init QtMultimedia audio record settings */
bool initAudioRecDevice();
signals:
void customChanged();
void doResetProfile();
......
......@@ -241,7 +241,6 @@ void MainWindow::init()
m_clipMonitor = new Monitor(Kdenlive::ClipMonitor, pCore->monitorManager(), this);
pCore->bin()->setMonitor(m_clipMonitor);
connect(m_clipMonitor, &Monitor::showConfigDialog, this, &MainWindow::slotPreferences);
connect(m_clipMonitor, &Monitor::addMarker, this, &MainWindow::slotAddMarkerGuideQuickly);
connect(m_clipMonitor, &Monitor::deleteMarker, this, &MainWindow::slotDeleteClipMarker);
connect(m_clipMonitor, &Monitor::seekToPreviousSnap, this, &MainWindow::slotSnapRewind);
......
......@@ -345,7 +345,6 @@ signals:
void seekToPreviousKeyframe();
void seekToKeyframe(int);
void addClipToProject(const QUrl &);
void showConfigDialog(int, int);
/** @brief Request display of current bin clip. */
void refreshCurrentClip();
void addEffect(const QStringList &);
......
......@@ -82,9 +82,7 @@ RecManager::RecManager(Monitor *parent)
m_audio_device = new QComboBox(parent);
QStringList audioDevices = pCore->getAudioCaptureDevices();
for (int ix = 0; ix < audioDevices.count(); ix++) {
m_audio_device->addItem(audioDevices.at(ix), ix);
}
m_audio_device->addItems(audioDevices);
connect(m_audio_device, static_cast<void (QComboBox::*)(int)>(&QComboBox::currentIndexChanged), this, &RecManager::slotAudioDeviceChanged);
QString selectedDevice = KdenliveSettings::defaultaudiocapture();
int selectedIndex = m_audio_device->findText(selectedDevice);
......@@ -143,7 +141,7 @@ RecManager::~RecManager() = default;
void RecManager::showRecConfig()
{
m_monitor->showConfigDialog(4, m_device_selector->currentData().toInt());
pCore->showConfigDialog(4, m_device_selector->currentData().toInt());
}
QToolBar *RecManager::toolbar() const
......
......@@ -534,6 +534,14 @@ Rectangle {
checkable: true
checked: headerMenu.recEnabled
}
OLD.MenuItem {
visible: headerMenu.audioTrack
id: configRec
text: "Configure Recording"
onTriggered: {
timeline.showConfig(4,2)
}
}
OLD.Menu {
title: i18n('Track thumbnails')
visible: !headerMenu.audioTrack
......
......@@ -506,6 +506,11 @@ void TimelineController::deleteTrack(int tid)
}
}
void TimelineController::showConfig(int page, int tab)
{
pCore->showConfigDialog(page, tab);
}
void TimelineController::gotoNextSnap()
{
setPosition(m_model->getNextSnapPos(timelinePosition()));
......
......@@ -112,7 +112,12 @@ public:
/* @brief Returns true is item is selected as well as other items */
Q_INVOKABLE bool isInSelection(int itemId);
/* @brief Show/hide audio record controls on a track
*/
Q_INVOKABLE void switchRecording(int trackId);
/* @brief Open Kdenlive's config diablog on a defined page and tab
*/
Q_INVOKABLE void showConfig(int page, int tab);
/* @brief returns current timeline's zoom factor
*/
......
......@@ -6,8 +6,8 @@
<rect>
<x>0</x>
<y>0</y>
<width>501</width>
<height>817</height>
<width>525</width>
<height>891</height>
</rect>
</property>
<layout class="QGridLayout" name="gridLayout_8">
......@@ -25,7 +25,7 @@
</widget>
</item>
<item row="0" column="1">
<widget class="KComboBox" name="kcfg_defaultcapture">
<widget class="QComboBox" name="kcfg_defaultcapture">
<property name="sizePolicy">
<sizepolicy hsizetype="Expanding" vsizetype="Fixed">
<horstretch>0</horstretch>
......@@ -53,7 +53,7 @@
</size>
</property>
<property name="currentIndex">
<number>0</number>
<number>3</number>
</property>
<widget class="QWidget" name="tab_2">
<attribute name="title">
......@@ -68,7 +68,7 @@
</widget>
</item>
<item row="1" column="6" colspan="5">
<widget class="KComboBox" name="kcfg_detectedv4ldevices"/>
<widget class="QComboBox" name="kcfg_detectedv4ldevices"/>
</item>
<item row="2" column="0" colspan="2">
<widget class="QLabel" name="label_14">
......@@ -102,7 +102,7 @@
</widget>
</item>
<item row="3" column="6" colspan="5">
<widget class="KComboBox" name="kcfg_v4l_format"/>
<widget class="QComboBox" name="kcfg_v4l_format"/>
</item>
<item row="4" column="0">
<widget class="QLabel" name="label_6">
......@@ -280,7 +280,7 @@
<widget class="QSpinBox" name="kcfg_alsachannels"/>
</item>
<item row="18" column="6" colspan="3">
<widget class="KComboBox" name="kcfg_v4l_profile">
<widget class="QComboBox" name="kcfg_v4l_profile">
<property name="sizePolicy">
<sizepolicy hsizetype="MinimumExpanding" vsizetype="Fixed">
<horstretch>0</horstretch>
......@@ -290,7 +290,7 @@
</widget>
</item>
<item row="15" column="0" colspan="8">
<widget class="KComboBox" name="kcfg_v4l_alsadevice">
<widget class="QComboBox" name="kcfg_v4l_alsadevice">
<property name="sizePolicy">
<sizepolicy hsizetype="MinimumExpanding" vsizetype="Fixed">
<horstretch>0</horstretch>
......@@ -344,7 +344,7 @@
</spacer>
</item>
<item row="0" column="0" colspan="5">
<widget class="KComboBox" name="kcfg_grab_capture_type">
<widget class="QComboBox" name="kcfg_grab_capture_type">
<item>
<property name="text">
<string>Full screen capture</string>
......@@ -480,7 +480,7 @@
</widget>
</item>
<item row="5" column="1" colspan="2">
<widget class="KComboBox" name="kcfg_grab_profile">
<widget class="QComboBox" name="kcfg_grab_profile">
<property name="sizePolicy">
<sizepolicy hsizetype="MinimumExpanding" vsizetype="Fixed">
<horstretch>0</horstretch>
......@@ -547,7 +547,7 @@
</widget>
</item>
<item row="0" column="1" colspan="8">
<widget class="KComboBox" name="kcfg_decklink_capturedevice">
<widget class="QComboBox" name="kcfg_decklink_capturedevice">
<property name="sizePolicy">
<sizepolicy hsizetype="Expanding" vsizetype="Fixed">
<horstretch>0</horstretch>
......@@ -606,7 +606,7 @@
</widget>
</item>
<item row="2" column="1" colspan="6">
<widget class="KComboBox" name="kcfg_decklink_profile">
<widget class="QComboBox" name="kcfg_decklink_profile">
<property name="sizePolicy">
<sizepolicy hsizetype="MinimumExpanding" vsizetype="Fixed">
<horstretch>0</horstretch>
......@@ -634,17 +634,72 @@
</item>
</layout>
</widget>
<widget class="QWidget" name="tab">
<attribute name="title">
<string>Audio</string>
</attribute>
<layout class="QGridLayout" name="gridLayout_2">
<item row="0" column="0">
<widget class="QLabel" name="label_2">
<property name="text">
<string>Audio Capture Volume </string>
</property>
</widget>
</item>
<item row="0" column="1">
<widget class="QSlider" name="kcfg_audiocapturevolume">
<property name="maximum">
<number>100</number>
</property>
<property name="sliderPosition">
<number>100</number>
</property>
<property name="tracking">
<bool>true</bool>
</property>
<property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
<property name="invertedAppearance">
<bool>false</bool>
</property>
<property name="invertedControls">
<bool>false</bool>
</property>
<property name="tickPosition">
<enum>QSlider::TicksAbove</enum>
</property>
</widget>
</item>
<item row="1" column="0">
<widget class="QLabel" name="label_33">
<property name="text">
<string>Detected devices</string>
</property>
</widget>
</item>
<item row="1" column="1">
<widget class="QComboBox" name="kcfg_defaultaudiocapture"/>
</item>
<item row="2" column="1">
<spacer name="verticalSpacer_2">
<property name="orientation">
<enum>Qt::Vertical</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>20</width>
<height>661</height>
</size>
</property>
</spacer>
</item>
</layout>
</widget>
</widget>
</item>
</layout>
</widget>
<customwidgets>
<customwidget>
<class>KComboBox</class>
<extends>QComboBox</extends>
<header>kcombobox.h</header>
</customwidget>
</customwidgets>
<tabstops>
<tabstop>kcfg_defaultcapture</tabstop>
<tabstop>tabWidget</tabstop>
......
......@@ -113,7 +113,7 @@
</widget>
</item>
<item row="2" column="1" colspan="5">
<widget class="KComboBox" name="shuttle1">
<widget class="QComboBox" name="shuttle1">
<property name="sizePolicy">
<sizepolicy hsizetype="Preferred" vsizetype="Fixed">
<horstretch>0</horstretch>
......@@ -123,7 +123,7 @@
</widget>
</item>
<item row="7" column="1" colspan="5">
<widget class="KComboBox" name="shuttle6"/>
<widget class="QComboBox" name="shuttle6"/>
</item>
<item row="14" column="0">
<widget class="QLabel" name="label_14">
......@@ -152,7 +152,7 @@
</widget>
</item>
<item row="12" column="1" colspan="5">
<widget class="KComboBox" name="shuttle11"/>
<widget class="QComboBox" name="shuttle11"/>
</item>
<item row="5" column="0">
<widget class="QLabel" name="label_7">
......@@ -194,13 +194,13 @@
</widget>
</item>
<item row="10" column="1" colspan="5">
<widget class="KComboBox" name="shuttle9"/>
<widget class="QComboBox" name="shuttle9"/>
</item>
<item row="5" column="1" colspan="5">
<widget class="KComboBox" name="shuttle4"/>
<widget class="QComboBox" name="shuttle4"/>
</item>
<item row="13" column="1" colspan="5">
<widget class="KComboBox" name="shuttle12"/>
<widget class="QComboBox" name="shuttle12"/>
</item>
<item row="8" column="0">
<widget class="QLabel" name="label_8">
......@@ -216,7 +216,7 @@
</widget>
</item>
<item row="3" column="1" colspan="5">
<widget class="KComboBox" name="shuttle2">
<widget class="QComboBox" name="shuttle2">
<property name="sizePolicy">
<sizepolicy hsizetype="Preferred" vsizetype="Fixed">
<horstretch>0</horstretch>
......@@ -226,10 +226,10 @@
</widget>
</item>
<item row="11" column="1" colspan="5">
<widget class="KComboBox" name="shuttle10"/>
<widget class="QComboBox" name="shuttle10"/>
</item>
<item row="9" column="1" colspan="5">
<widget class="KComboBox" name="shuttle8"/>
<widget class="QComboBox" name="shuttle8"/>
</item>
<item row="10" column="0">
<widget class="QLabel" name="label_10">
......@@ -258,7 +258,7 @@
</widget>
</item>
<item row="4" column="1" colspan="5">
<widget class="KComboBox" name="shuttle3"/>
<widget class="QComboBox" name="shuttle3"/>
</item>
<item row="11" column="0">
<widget class="QLabel" name="label_11">
......@@ -287,7 +287,7 @@
</widget>
</item>
<item row="0" column="1" colspan="4">
<widget class="KComboBox" name="shuttledevicelist">
<widget class="QComboBox" name="shuttledevicelist">
<property name="sizePolicy">
<sizepolicy hsizetype="Preferred" vsizetype="Fixed">
<horstretch>0</horstretch>
......@@ -310,19 +310,19 @@
</widget>
</item>
<item row="8" column="1" colspan="5">
<widget class="KComboBox" name="shuttle7"/>
<widget class="QComboBox" name="shuttle7"/>
</item>
<item row="15" column="1" colspan="5">
<widget class="KComboBox" name="shuttle14"/>
<widget class="QComboBox" name="shuttle14"/>
</item>
<item row="6" column="1" colspan="5">
<widget class="KComboBox" name="shuttle5"/>
<widget class="QComboBox" name="shuttle5"/>
</item>
<item row="14" column="1" colspan="5">
<widget class="KComboBox" name="shuttle13"/>
<widget class="QComboBox" name="shuttle13"/>
</item>
<item row="16" column="1" colspan="5">
<widget class="KComboBox" name="shuttle15"/>
<widget class="QComboBox" name="shuttle15"/>
</item>
<item row="15" column="0">
<widget class="QLabel" name="label_15">
......@@ -369,11 +369,6 @@
</layout>
</widget>
<customwidgets>
<customwidget>
<class>KComboBox</class>
<extends>QComboBox</extends>
<header>kcombobox.h</header>
</customwidget>
<customwidget>
<class>QLineEdit</class>
<extends>QLineEdit</extends>
......
......@@ -90,7 +90,7 @@
</widget>
</item>
<item>
<widget class="KComboBox" name="kcfg_preview_profile">
<widget class="QComboBox" name="kcfg_preview_profile">
<property name="sizePolicy">
<sizepolicy hsizetype="MinimumExpanding" vsizetype="Fixed">
<horstretch>0</horstretch>
......@@ -154,11 +154,6 @@
<header>kurlrequester.h</header>
<container>1</container>
</customwidget>
<customwidget>
<class>KComboBox</class>
<extends>QComboBox</extends>
<header>kcombobox.h</header>
</customwidget>
</customwidgets>
<resources/>
<connections>
......
<?xml version="1.0" encoding="UTF-8"?>
<ui version="4.0">
<class>ConfigProxy_UI</class>
<widget class="QWidget" name="ConfigProxy_UI">
......@@ -168,7 +167,7 @@
</widget>
</item>
<item row="1" column="1" colspan="2">
<widget class="KComboBox" name="kcfg_proxy_profile">
<widget class="QComboBox" name="kcfg_proxy_profile">
<property name="sizePolicy">
<sizepolicy hsizetype="MinimumExpanding" vsizetype="Fixed">
<horstretch>0</horstretch>
......@@ -201,13 +200,6 @@
</item>
</layout>
</widget>
<customwidgets>
<customwidget>
<class>KComboBox</class>
<extends>QComboBox</extends>
<header>kcombobox.h</header>
</customwidget>
</customwidgets>
<resources/>
<connections>
<connection>
......
......@@ -58,7 +58,7 @@
</widget>
</item>
<item row="0" column="1">
<widget class="KComboBox" name="kcfg_audio_driver"/>
<widget class="QComboBox" name="kcfg_audio_driver"/>
</item>
<item row="1" column="0">
<widget class="QLabel" name="textLabel1">
......@@ -71,7 +71,7 @@
</widget>
</item>
<item row="1" column="1">
<widget class="KComboBox" name="kcfg_audio_device"/>
<widget class="QComboBox" name="kcfg_audio_device"/>
</item>
</layout>
</widget>
......@@ -136,7 +136,7 @@
</widget>
</item>
<item row="8" column="1" colspan="4">
<widget class="KComboBox" name="kcfg_blackmagic_output_device">
<widget class="QComboBox" name="kcfg_blackmagic_output_device">
<property name="enabled">
<bool>true</bool>
</property>
......@@ -169,16 +169,11 @@
</spacer>
</item>
<item row="2" column="3" colspan="3">
<widget class="KComboBox" name="kcfg_audio_backend"/>
<widget class="QComboBox" name="kcfg_audio_backend"/>
</item>
</layout>
</widget>
<customwidgets>
<customwidget>
<class>KComboBox</class>
<extends>QComboBox</extends>
<header>kcombobox.h</header>
</customwidget>
<customwidget>
<class>KColorButton</class>
<extends>QPushButton</extends>
......