mirror of
https://github.com/gtalent/sc9k.git
synced 2025-05-13 13:21:37 -05:00
Compare commits
No commits in common. "master" and "release-1.0.0-beta5" have entirely different histories.
master
...
release-1.
@ -16,7 +16,6 @@ add_executable(
|
|||||||
settingsdata.cpp
|
settingsdata.cpp
|
||||||
settingsdialog.cpp
|
settingsdialog.cpp
|
||||||
slideview.cpp
|
slideview.cpp
|
||||||
sc9k.rc
|
|
||||||
)
|
)
|
||||||
|
|
||||||
target_link_libraries(
|
target_link_libraries(
|
||||||
|
@ -10,5 +10,5 @@
|
|||||||
|
|
||||||
constexpr auto MaxCameraPresets = 9;
|
constexpr auto MaxCameraPresets = 9;
|
||||||
constexpr auto MaxViews = 9;
|
constexpr auto MaxViews = 9;
|
||||||
constexpr auto Version = "1.0.0";
|
constexpr auto Version = "1.0-beta5";
|
||||||
|
|
||||||
|
@ -121,6 +121,18 @@ void MainWindow::setupMenu() {
|
|||||||
});
|
});
|
||||||
menu->addAction(cameraPresetAct);
|
menu->addAction(cameraPresetAct);
|
||||||
}
|
}
|
||||||
|
menu->addSeparator();
|
||||||
|
auto const rebootAct = new QAction(tr("&Reboot"), this);
|
||||||
|
connect(rebootAct, &QAction::triggered, &m_cameraClient, [this] {
|
||||||
|
QMessageBox confirm(this);
|
||||||
|
confirm.setText(tr("Are you sure you want to reboot the camera? This will take about 20 seconds."));
|
||||||
|
confirm.addButton(tr("&No"), QMessageBox::ButtonRole::NoRole);
|
||||||
|
confirm.addButton(tr("&Yes"), QMessageBox::ButtonRole::YesRole);
|
||||||
|
if (confirm.exec()) {
|
||||||
|
m_cameraClient.reboot();
|
||||||
|
}
|
||||||
|
});
|
||||||
|
menu->addAction(rebootAct);
|
||||||
}
|
}
|
||||||
// help menu
|
// help menu
|
||||||
{
|
{
|
||||||
@ -132,7 +144,7 @@ void MainWindow::setupMenu() {
|
|||||||
R"(Slide Controller 9000 - %1
|
R"(Slide Controller 9000 - %1
|
||||||
Build date: %2
|
Build date: %2
|
||||||
|
|
||||||
Copyright 2021 - 2025 Gary Talent (gary@drinkingtea.net)
|
Copyright 2021 - 2024 Gary Talent (gary@drinkingtea.net)
|
||||||
Slide Controller 9000 is released under the MPL 2.0
|
Slide Controller 9000 is released under the MPL 2.0
|
||||||
Built on Qt library under LGPL 2.0)").arg(Version, __DATE__));
|
Built on Qt library under LGPL 2.0)").arg(Version, __DATE__));
|
||||||
about.exec();
|
about.exec();
|
||||||
@ -189,8 +201,8 @@ void MainWindow::setupViewControls(QVBoxLayout *rootLyt) {
|
|||||||
});
|
});
|
||||||
views.emplace_back(View{
|
views.emplace_back(View{
|
||||||
.name = tr("Show"),
|
.name = tr("Show"),
|
||||||
.slides = true,
|
.slides = false,
|
||||||
.obsSlides = true,
|
.obsSlides = false,
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
setupViewControlButtons(views, viewCtlLyt);
|
setupViewControlButtons(views, viewCtlLyt);
|
||||||
|
BIN
src/sc9k.ico
BIN
src/sc9k.ico
Binary file not shown.
Before Width: | Height: | Size: 159 KiB |
@ -1 +0,0 @@
|
|||||||
IDI_ICON1 ICON DISCARDABLE "sc9k.ico"
|
|
@ -205,12 +205,12 @@ QWidget *SettingsDialog::setupButtons(QWidget *parent) {
|
|||||||
return root;
|
return root;
|
||||||
}
|
}
|
||||||
|
|
||||||
int SettingsDialog::handleApply() {
|
void SettingsDialog::handleApply() {
|
||||||
QSettings settings;
|
QSettings settings;
|
||||||
QVector<View> views;
|
QVector<View> views;
|
||||||
auto const viewsErr = collectViews(views);
|
auto const viewsErr = collectViews(views);
|
||||||
if (viewsErr) {
|
if (viewsErr) {
|
||||||
return -1;
|
return;
|
||||||
}
|
}
|
||||||
setViews(settings, views);
|
setViews(settings, views);
|
||||||
setCameraConnectionData(settings, {
|
setCameraConnectionData(settings, {
|
||||||
@ -227,13 +227,11 @@ int SettingsDialog::handleApply() {
|
|||||||
});
|
});
|
||||||
collectVideoConfig();
|
collectVideoConfig();
|
||||||
setVideoConfig(settings, m_videoConfig);
|
setVideoConfig(settings, m_videoConfig);
|
||||||
return 0;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
void SettingsDialog::handleOK() {
|
void SettingsDialog::handleOK() {
|
||||||
if (handleApply() == 0) {
|
handleApply();
|
||||||
accept();
|
accept();
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
void SettingsDialog::setupViewRow(int row, View const&view) {
|
void SettingsDialog::setupViewRow(int row, View const&view) {
|
||||||
|
@ -38,8 +38,7 @@ class SettingsDialog: public QDialog {
|
|||||||
QWidget *setupViewConfig(QWidget *parent);
|
QWidget *setupViewConfig(QWidget *parent);
|
||||||
QWidget *setupImageConfig(QWidget *parent);
|
QWidget *setupImageConfig(QWidget *parent);
|
||||||
QWidget *setupButtons(QWidget *parent);
|
QWidget *setupButtons(QWidget *parent);
|
||||||
[[nodiscard]]
|
void handleApply();
|
||||||
int handleApply();
|
|
||||||
void handleOK();
|
void handleOK();
|
||||||
void setupViewRow(int row, View const&view = {});
|
void setupViewRow(int row, View const&view = {});
|
||||||
/**
|
/**
|
||||||
|
Loading…
x
Reference in New Issue
Block a user