Skip to content

Commit cd265bb

Browse files
VekhirVekhir
committed
refactor: Remove redundant recording preferences
1 parent 0b4770a commit cd265bb

4 files changed

Lines changed: 4 additions & 245 deletions

File tree

‎resources/forms/mainWindow.ui‎

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1683,18 +1683,6 @@
16831683
<string>Configure Podcast Recording</string>
16841684
</property>
16851685
</action>
1686-
<action name="actionPodcastConfig">
1687-
<property name="icon">
1688-
<iconset resource="../OpenBoard.qrc">
1689-
<normaloff>:/images/toolbar/settings.png</normaloff>:/images/toolbar/settings.png</iconset>
1690-
</property>
1691-
<property name="text">
1692-
<string>Podcast Config</string>
1693-
</property>
1694-
<property name="toolTip">
1695-
<string>Configure Podcast Recording</string>
1696-
</property>
1697-
</action>
16981686
<action name="actionCaptureWebContent">
16991687
<property name="icon">
17001688
<iconset resource="../OpenBoard.qrc">

‎src/podcast/UBPodcastController.cpp‎

Lines changed: 0 additions & 162 deletions
Original file line numberDiff line numberDiff line change
@@ -94,13 +94,6 @@ UBPodcastController::UBPodcastController(QObject* pParent)
9494
, mRecordingState(Stopped)
9595
, mApplicationIsClosing(false)
9696
, mRecordingTimestampOffset(0)
97-
, mDefaultAudioInputDeviceAction(0)
98-
, mNoAudioInputDeviceAction(0)
99-
, mSmallVideoSizeAction(0)
100-
, mMediumVideoSizeAction(0)
101-
, mFullVideoSizeAction(0)
102-
, mYoutubePublicationAction(0)
103-
, mIntranetPublicationAction(0)
10497
{
10598
connect(UBApplication::applicationController, SIGNAL(mainModeChanged(UBApplicationController::MainMode)),
10699
this, SLOT(applicationMainModeChanged(UBApplicationController::MainMode)));
@@ -139,20 +132,6 @@ void UBPodcastController::applicationAboutToQuit()
139132
}
140133
}
141134

142-
143-
void UBPodcastController::groupActionTriggered(QAction* action)
144-
{
145-
Q_UNUSED(action);
146-
updateActionState();
147-
}
148-
149-
150-
void UBPodcastController::actionToggled(bool checked)
151-
{
152-
Q_UNUSED(checked);
153-
updateActionState();
154-
}
155-
156135
void UBPodcastController::openPodcastPreferencesDialog()
157136
{
158137
if (mPodcastPreferencesDialog)
@@ -231,37 +210,6 @@ void UBPodcastController::podcastPreferencesDialogAccepted()
231210
UBSettings::settings()->podcastPublishToYoutube->set(podcastPublishToYoutube);
232211
}
233212

234-
void UBPodcastController::updateActionState()
235-
{
236-
if (mSmallVideoSizeAction && mSmallVideoSizeAction->isChecked())
237-
UBSettings::settings()->podcastVideoSize->set("Small");
238-
else if (mFullVideoSizeAction && mFullVideoSizeAction->isChecked())
239-
UBSettings::settings()->podcastVideoSize->set("Full");
240-
else
241-
UBSettings::settings()->podcastVideoSize->reset();
242-
243-
UBSettings::settings()->podcastAudioRecordingDevice->reset();
244-
245-
if (mDefaultAudioInputDeviceAction && mDefaultAudioInputDeviceAction->isChecked())
246-
UBSettings::settings()->podcastAudioRecordingDevice->set("Default");
247-
else if (mNoAudioInputDeviceAction && mNoAudioInputDeviceAction->isChecked())
248-
UBSettings::settings()->podcastAudioRecordingDevice->set("None");
249-
else
250-
{
251-
foreach(QAction* action, mAudioInputDevicesActions)
252-
{
253-
if (action->isChecked())
254-
{
255-
UBSettings::settings()->podcastAudioRecordingDevice->set(action->text());
256-
break;
257-
}
258-
}
259-
}
260-
261-
UBSettings::settings()->podcastPublishToYoutube->set(mYoutubePublicationAction && mYoutubePublicationAction->isChecked());
262-
UBSettings::settings()->podcastPublishToIntranet->set(mIntranetPublicationAction && mIntranetPublicationAction->isChecked());
263-
264-
}
265213

266214
void UBPodcastController::widgetSizeChanged(const QSizeF size)
267215
{
@@ -1001,113 +949,3 @@ void UBPodcastController::setRecordingState(RecordingState pRecordingState)
1001949
}
1002950
}
1003951

1004-
1005-
QList<QAction*> UBPodcastController::audioRecordingDevicesActions()
1006-
{
1007-
if (mAudioInputDevicesActions.length() == 0)
1008-
{
1009-
QString settingsDevice = UBSettings::settings()->podcastAudioRecordingDevice->get().toString();
1010-
1011-
mDefaultAudioInputDeviceAction = new QAction(tr("Default Audio Input"), this);
1012-
QAction *checkedAction = mDefaultAudioInputDeviceAction;
1013-
1014-
mNoAudioInputDeviceAction = new QAction(tr("No Audio Recording"), this);
1015-
1016-
if (settingsDevice == "None")
1017-
checkedAction = mNoAudioInputDeviceAction;
1018-
1019-
mAudioInputDevicesActions << mNoAudioInputDeviceAction;
1020-
mAudioInputDevicesActions << mDefaultAudioInputDeviceAction;
1021-
1022-
foreach(QString audioDevice, audioRecordingDevices())
1023-
{
1024-
QAction* act = new QAction(audioDevice, this);
1025-
act->setCheckable(true);
1026-
mAudioInputDevicesActions << act;
1027-
if (settingsDevice == audioDevice)
1028-
checkedAction = act;
1029-
}
1030-
1031-
QActionGroup* audioInputActionGroup = new QActionGroup(this);
1032-
audioInputActionGroup->setExclusive(true);
1033-
1034-
foreach(QAction* action, mAudioInputDevicesActions)
1035-
{
1036-
audioInputActionGroup->addAction(action);
1037-
action->setCheckable(true);
1038-
}
1039-
checkedAction->setChecked(true);
1040-
1041-
connect(audioInputActionGroup, SIGNAL(triggered(QAction*)), this, SLOT(groupActionTriggered(QAction*)));
1042-
}
1043-
1044-
return mAudioInputDevicesActions;
1045-
1046-
}
1047-
1048-
1049-
QList<QAction*> UBPodcastController::videoSizeActions()
1050-
{
1051-
if (mVideoSizesActions.length() == 0)
1052-
{
1053-
mSmallVideoSizeAction = new QAction(tr("Small"), this);
1054-
mMediumVideoSizeAction = new QAction(tr("Medium"), this);
1055-
mFullVideoSizeAction = new QAction(tr("Full"), this);
1056-
1057-
mVideoSizesActions << mSmallVideoSizeAction;
1058-
mVideoSizesActions << mMediumVideoSizeAction;
1059-
mVideoSizesActions << mFullVideoSizeAction;
1060-
1061-
QActionGroup* videoSizeActionGroup = new QActionGroup(this);
1062-
videoSizeActionGroup->setExclusive(true);
1063-
1064-
foreach(QAction* videoSizeAction, mVideoSizesActions)
1065-
{
1066-
videoSizeAction->setCheckable(true);
1067-
videoSizeActionGroup->addAction(videoSizeAction);
1068-
}
1069-
1070-
QString videoSize = UBSettings::settings()->podcastVideoSize->get().toString();
1071-
1072-
if (videoSize == "Small")
1073-
mSmallVideoSizeAction->setChecked(true);
1074-
else if (videoSize == "Full")
1075-
mFullVideoSizeAction->setChecked(true);
1076-
else
1077-
mMediumVideoSizeAction->setChecked(true);
1078-
1079-
connect(videoSizeActionGroup, SIGNAL(triggered(QAction*)), this, SLOT(groupActionTriggered(QAction*)));
1080-
}
1081-
1082-
return mVideoSizesActions;
1083-
}
1084-
1085-
1086-
QList<QAction*> UBPodcastController::podcastPublicationActions()
1087-
{
1088-
if (mPodcastPublicationActions.length() == 0)
1089-
{
1090-
mIntranetPublicationAction = new QAction(tr("Publish to Intranet"), this);
1091-
1092-
mIntranetPublicationAction->setCheckable(true);
1093-
mIntranetPublicationAction->setChecked(UBSettings::settings()->podcastPublishToIntranet->get().toBool());
1094-
1095-
mPodcastPublicationActions << mIntranetPublicationAction;
1096-
1097-
mYoutubePublicationAction = new QAction(tr("Publish to Youtube"), this);
1098-
mYoutubePublicationAction->setCheckable(true);
1099-
mYoutubePublicationAction->setChecked(UBSettings::settings()->podcastPublishToYoutube->get().toBool());
1100-
1101-
mPodcastPublicationActions << mYoutubePublicationAction;
1102-
1103-
foreach(QAction* publicationAction, mPodcastPublicationActions)
1104-
{
1105-
connect(publicationAction, SIGNAL(toggled(bool)), this, SLOT(actionToggled(bool)));
1106-
}
1107-
}
1108-
1109-
return mPodcastPublicationActions;
1110-
}
1111-
1112-
1113-

‎src/podcast/UBPodcastController.h‎

Lines changed: 0 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -60,11 +60,6 @@ class UBPodcastController : public QObject
6060

6161
virtual QStringList audioRecordingDevices();
6262

63-
QList<QAction*> audioRecordingDevicesActions();
64-
QList<QAction*> videoSizeActions();
65-
66-
QList<QAction*> podcastPublicationActions();
67-
6863
enum RecordingState
6964
{
7065
Stopped = 0, Recording, Paused, Stopping
@@ -122,11 +117,6 @@ class UBPodcastController : public QObject
122117

123118
void applicationAboutToQuit();
124119

125-
void groupActionTriggered(QAction*);
126-
void actionToggled(bool);
127-
128-
void updateActionState();
129-
130120
private:
131121
void widgetSizeChanged(const QSizeF size);
132122

@@ -178,23 +168,8 @@ class UBPodcastController : public QObject
178168
QTime mTimeAtPaused;
179169
long mRecordingTimestampOffset;
180170

181-
QAction *mDefaultAudioInputDeviceAction;
182-
QAction *mNoAudioInputDeviceAction;
183-
184-
QList<QAction*> mAudioInputDevicesActions;
185-
QList<QAction*> mVideoSizesActions;
186-
187171
QPointer<UBPodcastPreferencesDialog> mPodcastPreferencesDialog;
188172

189-
QAction* mSmallVideoSizeAction;
190-
QAction* mMediumVideoSizeAction;
191-
QAction* mFullVideoSizeAction;
192-
193-
QList<QAction*> mPodcastPublicationActions;
194-
195-
QAction *mYoutubePublicationAction;
196-
QAction *mIntranetPublicationAction;
197-
198173
QString mPodcastRecordingPath;
199174

200175
#ifdef Q_OS_LINUX

‎src/podcast/UBPodcastRecordingPalette.cpp‎

Lines changed: 4 additions & 46 deletions
Original file line numberDiff line numberDiff line change
@@ -57,48 +57,6 @@ UBPodcastRecordingPalette::UBPodcastRecordingPalette(QWidget *parent)
5757

5858
layout()->addWidget(mLevelMeter);
5959
addAction(UBApplication::mainWindow->actionPodcastPreferences);
60-
addAction(UBApplication::mainWindow->actionPodcastConfig);
61-
62-
#if (QT_VERSION >= QT_VERSION_CHECK(6, 0, 0))
63-
foreach(QObject* menuWidget, UBApplication::mainWindow->actionPodcastConfig->associatedObjects())
64-
#else
65-
foreach(QWidget* menuWidget, UBApplication::mainWindow->actionPodcastConfig->associatedWidgets())
66-
#endif
67-
{
68-
QToolButton *tb = qobject_cast<QToolButton*>(menuWidget);
69-
70-
tb->setIconSize(QSize(16, 16));
71-
72-
if (tb && !tb->menu())
73-
{
74-
tb->setObjectName("ubButtonMenu");
75-
tb->setPopupMode(QToolButton::InstantPopup);
76-
QMenu* menu = new QMenu(this);
77-
78-
foreach(QAction* audioInputAction, UBPodcastController::instance()->audioRecordingDevicesActions())
79-
{
80-
menu->addAction(audioInputAction);
81-
}
82-
83-
menu->addSeparator();
84-
85-
foreach(QAction* videoSizeAction, UBPodcastController::instance()->videoSizeActions())
86-
{
87-
menu->addAction(videoSizeAction);
88-
}
89-
90-
menu->addSeparator();
91-
92-
QList<QAction*> podcastPublication = UBPodcastController::instance()->podcastPublicationActions();
93-
94-
foreach(QAction* publicationAction, podcastPublication)
95-
{
96-
menu->addAction(publicationAction);
97-
}
98-
99-
tb->setMenu(menu);
100-
}
101-
}
10260
}
10361

10462

@@ -120,7 +78,7 @@ void UBPodcastRecordingPalette::recordingStateChanged(UBPodcastController::Recor
12078

12179
//UBApplication::mainWindow->actionPodcastMic->setEnabled(false);
12280

123-
UBApplication::mainWindow->actionPodcastConfig->setEnabled(false);
81+
UBApplication::mainWindow->actionPodcastPreferences->setEnabled(false);
12482
}
12583
else if (state == UBPodcastController::Stopped)
12684
{
@@ -131,7 +89,7 @@ void UBPodcastRecordingPalette::recordingStateChanged(UBPodcastController::Recor
13189
UBApplication::mainWindow->actionPodcastPause->setEnabled(false);
13290

13391
//UBApplication::mainWindow->actionPodcastMic->setEnabled(true);
134-
UBApplication::mainWindow->actionPodcastConfig->setEnabled(true);
92+
UBApplication::mainWindow->actionPodcastPreferences->setEnabled(true);
13593
}
13694
else if (state == UBPodcastController::Paused)
13795
{
@@ -142,13 +100,13 @@ void UBPodcastRecordingPalette::recordingStateChanged(UBPodcastController::Recor
142100
UBApplication::mainWindow->actionPodcastPause->setEnabled(true);
143101

144102
//UBApplication::mainWindow->actionPodcastMic->setEnabled(false);
145-
UBApplication::mainWindow->actionPodcastConfig->setEnabled(false);
103+
UBApplication::mainWindow->actionPodcastPreferences->setEnabled(false);
146104
}
147105
else
148106
{
149107
UBApplication::mainWindow->actionPodcastRecord->setEnabled(false);
150108
UBApplication::mainWindow->actionPodcastPause->setEnabled(false);
151-
UBApplication::mainWindow->actionPodcastConfig->setEnabled(false);
109+
UBApplication::mainWindow->actionPodcastPreferences->setEnabled(false);
152110
}
153111
}
154112

0 commit comments

Comments
 (0)