format: reformatting files
This commit is contained in:
@@ -25,9 +25,9 @@ add_subdirectory(footageproperties)
|
||||
add_subdirectory(footagerelink)
|
||||
add_subdirectory(keyframeproperties)
|
||||
add_subdirectory(markerproperties)
|
||||
if(OpenTimelineIO_FOUND)
|
||||
add_subdirectory(otioproperties)
|
||||
endif()
|
||||
if (OpenTimelineIO_FOUND)
|
||||
add_subdirectory(otioproperties)
|
||||
endif ()
|
||||
add_subdirectory(preferences)
|
||||
add_subdirectory(progress)
|
||||
add_subdirectory(projectproperties)
|
||||
@@ -38,6 +38,6 @@ add_subdirectory(task)
|
||||
add_subdirectory(text)
|
||||
|
||||
set(OLIVE_SOURCES
|
||||
${OLIVE_SOURCES}
|
||||
PARENT_SCOPE
|
||||
${OLIVE_SOURCES}
|
||||
PARENT_SCOPE
|
||||
)
|
||||
|
||||
@@ -15,11 +15,11 @@
|
||||
# along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||
|
||||
set(OLIVE_SOURCES
|
||||
${OLIVE_SOURCES}
|
||||
dialog/about/about.cpp
|
||||
dialog/about/about.h
|
||||
dialog/about/patreon.h
|
||||
dialog/about/scrollinglabel.cpp
|
||||
dialog/about/scrollinglabel.h
|
||||
PARENT_SCOPE
|
||||
${OLIVE_SOURCES}
|
||||
dialog/about/about.cpp
|
||||
dialog/about/about.h
|
||||
dialog/about/patreon.h
|
||||
dialog/about/scrollinglabel.cpp
|
||||
dialog/about/scrollinglabel.h
|
||||
PARENT_SCOPE
|
||||
)
|
||||
|
||||
@@ -66,12 +66,13 @@ AboutDialog::AboutDialog(bool welcome_dialog, QWidget *parent)
|
||||
"<p>%3</p>" // Description
|
||||
"<p>%4</p>" // Fork notice
|
||||
"</body></html>")
|
||||
.arg(QApplication::applicationName(),
|
||||
QApplication::applicationVersion(),
|
||||
tr("Oak Video Editor is a free open source non-linear video editor. "
|
||||
"This software is licensed under the GNU GPL Version 3."),
|
||||
tr("This project is a fork of "
|
||||
"<a href=\"https://github.com/olive-editor/olive\">Olive Video Editor</a>.")));
|
||||
.arg(
|
||||
QApplication::applicationName(),
|
||||
QApplication::applicationVersion(),
|
||||
tr("Oak Video Editor is a free open source non-linear video editor. "
|
||||
"This software is licensed under the GNU GPL Version 3."),
|
||||
tr("This project is a fork of "
|
||||
"<a href=\"https://github.com/olive-editor/olive\">Olive Video Editor</a>.")));
|
||||
|
||||
// Set text formatting
|
||||
label->setAlignment(Qt::AlignLeft | Qt::AlignVCenter);
|
||||
|
||||
@@ -57,7 +57,7 @@ url = 'https://www.patreon.com/api/oauth2/v2/campaigns/1478705/members?include=c
|
||||
name_list = ''
|
||||
|
||||
while True:
|
||||
member_data = requests.get(url, headers = {"authorization": "Bearer " + os.environ.get('PATREON_KEY')})
|
||||
member_data = requests.get(url, headers={"authorization": "Bearer " + os.environ.get('PATREON_KEY')})
|
||||
member_data_decoded = json.loads(member_data.text)
|
||||
|
||||
for member in member_data_decoded["data"]:
|
||||
@@ -68,16 +68,17 @@ while True:
|
||||
name = member["attributes"]["full_name"]
|
||||
name_list += " QStringLiteral(\""
|
||||
name_list += name.translate(str.maketrans({
|
||||
"\"": "\\\"",
|
||||
"\\": "\\\\"
|
||||
}))
|
||||
"\"": "\\\"",
|
||||
"\\": "\\\\"
|
||||
}))
|
||||
name_list += "\")"
|
||||
|
||||
if "links" in member_data_decoded:
|
||||
url = member_data_decoded["links"]["next"]
|
||||
url = member_data_decoded["links"]["next"]
|
||||
else:
|
||||
break
|
||||
break
|
||||
|
||||
text_file = open("patreon.h", "w", encoding="utf-8")
|
||||
text_file.write("#ifndef PATREON_H\n#define PATREON_H\n\n#include <QStringList>\n\nQStringList patrons = {\n%s\n};\n\n#endif // PATREON_H\n" % name_list)
|
||||
text_file.write(
|
||||
"#ifndef PATREON_H\n#define PATREON_H\n\n#include <QStringList>\n\nQStringList patrons = {\n%s\n};\n\n#endif // PATREON_H\n" % name_list)
|
||||
text_file.close()
|
||||
|
||||
@@ -15,8 +15,8 @@
|
||||
# along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||
|
||||
set(OLIVE_SOURCES
|
||||
${OLIVE_SOURCES}
|
||||
dialog/actionsearch/actionsearch.h
|
||||
dialog/actionsearch/actionsearch.cpp
|
||||
PARENT_SCOPE
|
||||
${OLIVE_SOURCES}
|
||||
dialog/actionsearch/actionsearch.h
|
||||
dialog/actionsearch/actionsearch.cpp
|
||||
PARENT_SCOPE
|
||||
)
|
||||
|
||||
@@ -15,8 +15,8 @@
|
||||
# along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||
|
||||
set(OLIVE_SOURCES
|
||||
${OLIVE_SOURCES}
|
||||
dialog/autorecovery/autorecoverydialog.h
|
||||
dialog/autorecovery/autorecoverydialog.cpp
|
||||
PARENT_SCOPE
|
||||
${OLIVE_SOURCES}
|
||||
dialog/autorecovery/autorecoverydialog.h
|
||||
dialog/autorecovery/autorecoverydialog.cpp
|
||||
PARENT_SCOPE
|
||||
)
|
||||
|
||||
@@ -15,8 +15,8 @@
|
||||
# along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||
|
||||
set(OLIVE_SOURCES
|
||||
${OLIVE_SOURCES}
|
||||
dialog/color/colordialog.h
|
||||
dialog/color/colordialog.cpp
|
||||
PARENT_SCOPE
|
||||
${OLIVE_SOURCES}
|
||||
dialog/color/colordialog.h
|
||||
dialog/color/colordialog.cpp
|
||||
PARENT_SCOPE
|
||||
)
|
||||
|
||||
@@ -15,10 +15,10 @@
|
||||
# along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||
|
||||
set(OLIVE_SOURCES
|
||||
${OLIVE_SOURCES}
|
||||
dialog/configbase/configdialogbase.cpp
|
||||
dialog/configbase/configdialogbase.h
|
||||
dialog/configbase/configdialogbasetab.cpp
|
||||
dialog/configbase/configdialogbasetab.h
|
||||
PARENT_SCOPE
|
||||
${OLIVE_SOURCES}
|
||||
dialog/configbase/configdialogbase.cpp
|
||||
dialog/configbase/configdialogbase.h
|
||||
dialog/configbase/configdialogbasetab.cpp
|
||||
dialog/configbase/configdialogbasetab.h
|
||||
PARENT_SCOPE
|
||||
)
|
||||
|
||||
@@ -15,8 +15,8 @@
|
||||
# along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||
|
||||
set(OLIVE_SOURCES
|
||||
${OLIVE_SOURCES}
|
||||
dialog/diskcache/diskcachedialog.h
|
||||
dialog/diskcache/diskcachedialog.cpp
|
||||
PARENT_SCOPE
|
||||
${OLIVE_SOURCES}
|
||||
dialog/diskcache/diskcachedialog.h
|
||||
dialog/diskcache/diskcachedialog.cpp
|
||||
PARENT_SCOPE
|
||||
)
|
||||
|
||||
@@ -26,7 +26,6 @@
|
||||
#include <QLabel>
|
||||
#include <QMessageBox>
|
||||
|
||||
|
||||
namespace olive
|
||||
{
|
||||
|
||||
|
||||
@@ -17,20 +17,20 @@
|
||||
add_subdirectory(codec)
|
||||
|
||||
set(OLIVE_SOURCES
|
||||
${OLIVE_SOURCES}
|
||||
dialog/export/export.cpp
|
||||
dialog/export/export.h
|
||||
dialog/export/exportadvancedvideodialog.cpp
|
||||
dialog/export/exportadvancedvideodialog.h
|
||||
dialog/export/exportaudiotab.cpp
|
||||
dialog/export/exportaudiotab.h
|
||||
dialog/export/exportformatcombobox.cpp
|
||||
dialog/export/exportformatcombobox.h
|
||||
dialog/export/exportsavepresetdialog.cpp
|
||||
dialog/export/exportsavepresetdialog.h
|
||||
dialog/export/exportsubtitlestab.cpp
|
||||
dialog/export/exportsubtitlestab.h
|
||||
dialog/export/exportvideotab.cpp
|
||||
dialog/export/exportvideotab.h
|
||||
PARENT_SCOPE
|
||||
${OLIVE_SOURCES}
|
||||
dialog/export/export.cpp
|
||||
dialog/export/export.h
|
||||
dialog/export/exportadvancedvideodialog.cpp
|
||||
dialog/export/exportadvancedvideodialog.h
|
||||
dialog/export/exportaudiotab.cpp
|
||||
dialog/export/exportaudiotab.h
|
||||
dialog/export/exportformatcombobox.cpp
|
||||
dialog/export/exportformatcombobox.h
|
||||
dialog/export/exportsavepresetdialog.cpp
|
||||
dialog/export/exportsavepresetdialog.h
|
||||
dialog/export/exportsubtitlestab.cpp
|
||||
dialog/export/exportsubtitlestab.h
|
||||
dialog/export/exportvideotab.cpp
|
||||
dialog/export/exportvideotab.h
|
||||
PARENT_SCOPE
|
||||
)
|
||||
|
||||
@@ -15,18 +15,18 @@
|
||||
# along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||
|
||||
set(OLIVE_SOURCES
|
||||
${OLIVE_SOURCES}
|
||||
dialog/export/codec/av1section.cpp
|
||||
dialog/export/codec/av1section.h
|
||||
dialog/export/codec/cineformsection.cpp
|
||||
dialog/export/codec/cineformsection.h
|
||||
dialog/export/codec/codecsection.cpp
|
||||
dialog/export/codec/codecsection.h
|
||||
dialog/export/codec/codecstack.cpp
|
||||
dialog/export/codec/codecstack.h
|
||||
dialog/export/codec/h264section.cpp
|
||||
dialog/export/codec/h264section.h
|
||||
dialog/export/codec/imagesection.cpp
|
||||
dialog/export/codec/imagesection.h
|
||||
PARENT_SCOPE
|
||||
${OLIVE_SOURCES}
|
||||
dialog/export/codec/av1section.cpp
|
||||
dialog/export/codec/av1section.h
|
||||
dialog/export/codec/cineformsection.cpp
|
||||
dialog/export/codec/cineformsection.h
|
||||
dialog/export/codec/codecsection.cpp
|
||||
dialog/export/codec/codecsection.h
|
||||
dialog/export/codec/codecstack.cpp
|
||||
dialog/export/codec/codecstack.h
|
||||
dialog/export/codec/h264section.cpp
|
||||
dialog/export/codec/h264section.h
|
||||
dialog/export/codec/imagesection.cpp
|
||||
dialog/export/codec/imagesection.h
|
||||
PARENT_SCOPE
|
||||
)
|
||||
|
||||
@@ -24,7 +24,6 @@
|
||||
#include <QGridLayout>
|
||||
#include <QLabel>
|
||||
|
||||
|
||||
namespace olive
|
||||
{
|
||||
|
||||
|
||||
@@ -17,8 +17,8 @@
|
||||
add_subdirectory(streamproperties)
|
||||
|
||||
set(OLIVE_SOURCES
|
||||
${OLIVE_SOURCES}
|
||||
dialog/footageproperties/footageproperties.cpp
|
||||
dialog/footageproperties/footageproperties.h
|
||||
PARENT_SCOPE
|
||||
${OLIVE_SOURCES}
|
||||
dialog/footageproperties/footageproperties.cpp
|
||||
dialog/footageproperties/footageproperties.h
|
||||
PARENT_SCOPE
|
||||
)
|
||||
|
||||
@@ -15,12 +15,12 @@
|
||||
# along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||
|
||||
set(OLIVE_SOURCES
|
||||
${OLIVE_SOURCES}
|
||||
dialog/footageproperties/streamproperties/streamproperties.h
|
||||
dialog/footageproperties/streamproperties/streamproperties.cpp
|
||||
dialog/footageproperties/streamproperties/audiostreamproperties.h
|
||||
dialog/footageproperties/streamproperties/audiostreamproperties.cpp
|
||||
dialog/footageproperties/streamproperties/videostreamproperties.h
|
||||
dialog/footageproperties/streamproperties/videostreamproperties.cpp
|
||||
PARENT_SCOPE
|
||||
${OLIVE_SOURCES}
|
||||
dialog/footageproperties/streamproperties/streamproperties.h
|
||||
dialog/footageproperties/streamproperties/streamproperties.cpp
|
||||
dialog/footageproperties/streamproperties/audiostreamproperties.h
|
||||
dialog/footageproperties/streamproperties/audiostreamproperties.cpp
|
||||
dialog/footageproperties/streamproperties/videostreamproperties.h
|
||||
dialog/footageproperties/streamproperties/videostreamproperties.cpp
|
||||
PARENT_SCOPE
|
||||
)
|
||||
|
||||
@@ -15,8 +15,8 @@
|
||||
# along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||
|
||||
set(OLIVE_SOURCES
|
||||
${OLIVE_SOURCES}
|
||||
dialog/footagerelink/footagerelinkdialog.h
|
||||
dialog/footagerelink/footagerelinkdialog.cpp
|
||||
PARENT_SCOPE
|
||||
${OLIVE_SOURCES}
|
||||
dialog/footagerelink/footagerelinkdialog.h
|
||||
dialog/footagerelink/footagerelinkdialog.cpp
|
||||
PARENT_SCOPE
|
||||
)
|
||||
|
||||
@@ -15,8 +15,8 @@
|
||||
# along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||
|
||||
set(OLIVE_SOURCES
|
||||
${OLIVE_SOURCES}
|
||||
dialog/keyframeproperties/keyframeproperties.h
|
||||
dialog/keyframeproperties/keyframeproperties.cpp
|
||||
PARENT_SCOPE
|
||||
${OLIVE_SOURCES}
|
||||
dialog/keyframeproperties/keyframeproperties.h
|
||||
dialog/keyframeproperties/keyframeproperties.cpp
|
||||
PARENT_SCOPE
|
||||
)
|
||||
|
||||
@@ -15,8 +15,8 @@
|
||||
# along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||
|
||||
set(OLIVE_SOURCES
|
||||
${OLIVE_SOURCES}
|
||||
dialog/markerproperties/markerpropertiesdialog.h
|
||||
dialog/markerproperties/markerpropertiesdialog.cpp
|
||||
PARENT_SCOPE
|
||||
${OLIVE_SOURCES}
|
||||
dialog/markerproperties/markerpropertiesdialog.h
|
||||
dialog/markerproperties/markerpropertiesdialog.cpp
|
||||
PARENT_SCOPE
|
||||
)
|
||||
|
||||
@@ -15,8 +15,8 @@
|
||||
# along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||
|
||||
set(OLIVE_SOURCES
|
||||
${OLIVE_SOURCES}
|
||||
dialog/otioproperties/otiopropertiesdialog.h
|
||||
dialog/otioproperties/otiopropertiesdialog.cpp
|
||||
PARENT_SCOPE
|
||||
${OLIVE_SOURCES}
|
||||
dialog/otioproperties/otiopropertiesdialog.h
|
||||
dialog/otioproperties/otiopropertiesdialog.cpp
|
||||
PARENT_SCOPE
|
||||
)
|
||||
|
||||
@@ -17,10 +17,10 @@
|
||||
add_subdirectory(tabs)
|
||||
|
||||
set(OLIVE_SOURCES
|
||||
${OLIVE_SOURCES}
|
||||
dialog/preferences/keysequenceeditor.h
|
||||
dialog/preferences/keysequenceeditor.cpp
|
||||
dialog/preferences/preferences.h
|
||||
dialog/preferences/preferences.cpp
|
||||
PARENT_SCOPE
|
||||
${OLIVE_SOURCES}
|
||||
dialog/preferences/keysequenceeditor.h
|
||||
dialog/preferences/keysequenceeditor.cpp
|
||||
dialog/preferences/preferences.h
|
||||
dialog/preferences/preferences.cpp
|
||||
PARENT_SCOPE
|
||||
)
|
||||
|
||||
@@ -46,16 +46,19 @@ PreferencesDialog::PreferencesDialog(MainWindow *main_window, int start_tab)
|
||||
AddTab(new PreferencesGeneralTab(), tr("General"));
|
||||
AddTab(new PreferencesAppearanceTab(), tr("Appearance"));
|
||||
AddTab(new PreferencesAudioTab(), tr("Audio"));
|
||||
AddTab(new PreferencesBehaviorTab(PreferencesBehaviorTab::kCategoryTimeline),
|
||||
tr("Timeline"));
|
||||
AddTab(new PreferencesBehaviorTab(PreferencesBehaviorTab::kCategoryPlayback),
|
||||
tr("Playback"));
|
||||
AddTab(
|
||||
new PreferencesBehaviorTab(PreferencesBehaviorTab::kCategoryTimeline),
|
||||
tr("Timeline"));
|
||||
AddTab(
|
||||
new PreferencesBehaviorTab(PreferencesBehaviorTab::kCategoryPlayback),
|
||||
tr("Playback"));
|
||||
AddTab(new PreferencesBehaviorTab(PreferencesBehaviorTab::kCategoryProject),
|
||||
tr("Project"));
|
||||
AddTab(new PreferencesBehaviorTab(PreferencesBehaviorTab::kCategoryNodes),
|
||||
tr("Nodes"));
|
||||
AddTab(new PreferencesBehaviorTab(PreferencesBehaviorTab::kCategoryRendering),
|
||||
tr("Rendering"));
|
||||
AddTab(
|
||||
new PreferencesBehaviorTab(PreferencesBehaviorTab::kCategoryRendering),
|
||||
tr("Rendering"));
|
||||
AddTab(new PreferencesDiskTab(), tr("Disk"));
|
||||
AddTab(new PreferencesKeyboardTab(main_window), tr("Keyboard"));
|
||||
|
||||
|
||||
@@ -15,18 +15,18 @@
|
||||
# along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||
|
||||
set(OLIVE_SOURCES
|
||||
${OLIVE_SOURCES}
|
||||
dialog/preferences/tabs/preferencesgeneraltab.h
|
||||
dialog/preferences/tabs/preferencesgeneraltab.cpp
|
||||
dialog/preferences/tabs/preferencesbehaviortab.h
|
||||
dialog/preferences/tabs/preferencesbehaviortab.cpp
|
||||
dialog/preferences/tabs/preferencesdisktab.h
|
||||
dialog/preferences/tabs/preferencesdisktab.cpp
|
||||
dialog/preferences/tabs/preferencesappearancetab.h
|
||||
dialog/preferences/tabs/preferencesappearancetab.cpp
|
||||
dialog/preferences/tabs/preferencesaudiotab.h
|
||||
dialog/preferences/tabs/preferencesaudiotab.cpp
|
||||
dialog/preferences/tabs/preferenceskeyboardtab.h
|
||||
dialog/preferences/tabs/preferenceskeyboardtab.cpp
|
||||
PARENT_SCOPE
|
||||
${OLIVE_SOURCES}
|
||||
dialog/preferences/tabs/preferencesgeneraltab.h
|
||||
dialog/preferences/tabs/preferencesgeneraltab.cpp
|
||||
dialog/preferences/tabs/preferencesbehaviortab.h
|
||||
dialog/preferences/tabs/preferencesbehaviortab.cpp
|
||||
dialog/preferences/tabs/preferencesdisktab.h
|
||||
dialog/preferences/tabs/preferencesdisktab.cpp
|
||||
dialog/preferences/tabs/preferencesappearancetab.h
|
||||
dialog/preferences/tabs/preferencesappearancetab.cpp
|
||||
dialog/preferences/tabs/preferencesaudiotab.h
|
||||
dialog/preferences/tabs/preferencesaudiotab.cpp
|
||||
dialog/preferences/tabs/preferenceskeyboardtab.h
|
||||
dialog/preferences/tabs/preferenceskeyboardtab.cpp
|
||||
PARENT_SCOPE
|
||||
)
|
||||
|
||||
@@ -40,8 +40,7 @@ PreferencesBehaviorTab::PreferencesBehaviorTab(Category category)
|
||||
AddItems({
|
||||
{ tr("Auto-Seek to Imported Clips"),
|
||||
QStringLiteral("EnableSeekToImport") },
|
||||
{ tr("Edit Tool Also Seeks"),
|
||||
QStringLiteral("EditToolAlsoSeeks") },
|
||||
{ tr("Edit Tool Also Seeks"), QStringLiteral("EditToolAlsoSeeks") },
|
||||
{ tr("Edit Tool Selects Links"),
|
||||
QStringLiteral("EditToolSelectsLinks") },
|
||||
{ tr("Enable Drag Files to Timeline"),
|
||||
@@ -83,8 +82,7 @@ PreferencesBehaviorTab::PreferencesBehaviorTab(Category category)
|
||||
});
|
||||
break;
|
||||
|
||||
case kCategoryRendering:
|
||||
{
|
||||
case kCategoryRendering: {
|
||||
QLabel *backend_label = new QLabel(tr("Graphics Backend"));
|
||||
backend_label->setToolTip(
|
||||
tr("Selects the graphics API Oak should request on next launch. "
|
||||
@@ -94,17 +92,16 @@ PreferencesBehaviorTab::PreferencesBehaviorTab(Category category)
|
||||
|
||||
graphics_backend_combobox_ = new QComboBox();
|
||||
graphics_backend_combobox_->addItem(tr("OpenGL"),
|
||||
QStringLiteral("opengl"));
|
||||
QStringLiteral("opengl"));
|
||||
graphics_backend_combobox_->addItem(tr("Vulkan (experimental)"),
|
||||
QStringLiteral("vulkan"));
|
||||
QStringLiteral("vulkan"));
|
||||
const QString current_backend =
|
||||
OLIVE_CONFIG("GraphicsBackend").toString().toLower();
|
||||
const int backend_index = graphics_backend_combobox_->findData(
|
||||
current_backend.isEmpty() ? QStringLiteral("opengl")
|
||||
: current_backend);
|
||||
graphics_backend_combobox_->setCurrentIndex(backend_index >= 0
|
||||
? backend_index
|
||||
: 0);
|
||||
current_backend.isEmpty() ? QStringLiteral("opengl") :
|
||||
current_backend);
|
||||
graphics_backend_combobox_->setCurrentIndex(
|
||||
backend_index >= 0 ? backend_index : 0);
|
||||
|
||||
QHBoxLayout *backend_layout = new QHBoxLayout();
|
||||
backend_layout->addWidget(backend_label);
|
||||
|
||||
@@ -49,7 +49,8 @@ public:
|
||||
|
||||
static QString BehaviorPrefTr(const char *text)
|
||||
{
|
||||
return QCoreApplication::translate("olive::PreferencesBehaviorTab", text);
|
||||
return QCoreApplication::translate("olive::PreferencesBehaviorTab",
|
||||
text);
|
||||
}
|
||||
|
||||
private:
|
||||
|
||||
@@ -105,16 +105,14 @@ PreferencesDiskTab::PreferencesDiskTab()
|
||||
proxy_width_slider_ = new IntegerSlider();
|
||||
proxy_width_slider_->SetMinimum(160);
|
||||
proxy_width_slider_->SetMaximum(4096);
|
||||
proxy_width_slider_->SetValue(
|
||||
OLIVE_CONFIG("ProxyWidth").value<int>());
|
||||
proxy_width_slider_->SetValue(OLIVE_CONFIG("ProxyWidth").value<int>());
|
||||
proxy_layout->addWidget(proxy_width_slider_, proxy_row, 1);
|
||||
|
||||
proxy_layout->addWidget(new QLabel(tr("Proxy Height:")), proxy_row, 2);
|
||||
proxy_height_slider_ = new IntegerSlider();
|
||||
proxy_height_slider_->SetMinimum(120);
|
||||
proxy_height_slider_->SetMaximum(2160);
|
||||
proxy_height_slider_->SetValue(
|
||||
OLIVE_CONFIG("ProxyHeight").value<int>());
|
||||
proxy_height_slider_->SetValue(OLIVE_CONFIG("ProxyHeight").value<int>());
|
||||
proxy_layout->addWidget(proxy_height_slider_, proxy_row, 3);
|
||||
|
||||
proxy_row++;
|
||||
@@ -123,28 +121,22 @@ PreferencesDiskTab::PreferencesDiskTab()
|
||||
proxy_crf_slider_ = new IntegerSlider();
|
||||
proxy_crf_slider_->SetMinimum(0);
|
||||
proxy_crf_slider_->SetMaximum(51);
|
||||
proxy_crf_slider_->SetValue(
|
||||
OLIVE_CONFIG("ProxyCRF").value<int>());
|
||||
proxy_crf_slider_->SetValue(OLIVE_CONFIG("ProxyCRF").value<int>());
|
||||
proxy_layout->addWidget(proxy_crf_slider_, proxy_row, 1);
|
||||
|
||||
proxy_layout->addWidget(new QLabel(tr("Proxy Preset:")), proxy_row, 2);
|
||||
proxy_preset_combo_ = new QComboBox();
|
||||
const QStringList presets = {
|
||||
QStringLiteral("ultrafast"),
|
||||
QStringLiteral("superfast"),
|
||||
QStringLiteral("veryfast"),
|
||||
QStringLiteral("faster"),
|
||||
QStringLiteral("fast"),
|
||||
QStringLiteral("medium"),
|
||||
QStringLiteral("slow"),
|
||||
QStringLiteral("slower"),
|
||||
QStringLiteral("ultrafast"), QStringLiteral("superfast"),
|
||||
QStringLiteral("veryfast"), QStringLiteral("faster"),
|
||||
QStringLiteral("fast"), QStringLiteral("medium"),
|
||||
QStringLiteral("slow"), QStringLiteral("slower"),
|
||||
QStringLiteral("veryslow"),
|
||||
};
|
||||
for (const QString &preset : presets) {
|
||||
proxy_preset_combo_->addItem(preset);
|
||||
}
|
||||
proxy_preset_combo_->setCurrentText(
|
||||
OLIVE_CONFIG("ProxyPreset").toString());
|
||||
proxy_preset_combo_->setCurrentText(OLIVE_CONFIG("ProxyPreset").toString());
|
||||
proxy_layout->addWidget(proxy_preset_combo_, proxy_row, 3);
|
||||
|
||||
outer_layout->addStretch();
|
||||
@@ -185,8 +177,10 @@ void PreferencesDiskTab::Accept(MultiUndoCommand *command)
|
||||
OLIVE_CONFIG("DiskCacheAhead") = QVariant::fromValue(
|
||||
rational::fromDouble(cache_ahead_slider_->GetValue()));
|
||||
|
||||
OLIVE_CONFIG("ProxyWidth") = static_cast<int>(proxy_width_slider_->GetValue());
|
||||
OLIVE_CONFIG("ProxyHeight") = static_cast<int>(proxy_height_slider_->GetValue());
|
||||
OLIVE_CONFIG("ProxyWidth") =
|
||||
static_cast<int>(proxy_width_slider_->GetValue());
|
||||
OLIVE_CONFIG("ProxyHeight") =
|
||||
static_cast<int>(proxy_height_slider_->GetValue());
|
||||
OLIVE_CONFIG("ProxyCRF") = static_cast<int>(proxy_crf_slider_->GetValue());
|
||||
OLIVE_CONFIG("ProxyPreset") = proxy_preset_combo_->currentText();
|
||||
}
|
||||
|
||||
@@ -169,21 +169,25 @@ PreferencesGeneralTab::PreferencesGeneralTab()
|
||||
}
|
||||
|
||||
{
|
||||
QGroupBox *behavior_groupbox = new QGroupBox(PreferencesBehaviorTab::BehaviorPrefTr("Behavior"));
|
||||
QGroupBox *behavior_groupbox =
|
||||
new QGroupBox(PreferencesBehaviorTab::BehaviorPrefTr("Behavior"));
|
||||
QVBoxLayout *behavior_layout = new QVBoxLayout(behavior_groupbox);
|
||||
layout->addWidget(behavior_groupbox);
|
||||
|
||||
hover_focus_ = new QCheckBox(PreferencesBehaviorTab::BehaviorPrefTr("Enable hover focus"));
|
||||
hover_focus_ = new QCheckBox(
|
||||
PreferencesBehaviorTab::BehaviorPrefTr("Enable hover focus"));
|
||||
hover_focus_->setToolTip(PreferencesBehaviorTab::BehaviorPrefTr(
|
||||
"Panels will be considered focused when the mouse cursor is over them without having to click them."));
|
||||
hover_focus_->setChecked(OLIVE_CONFIG("HoverFocus").toBool());
|
||||
behavior_layout->addWidget(hover_focus_);
|
||||
|
||||
slider_ladder_ = new QCheckBox(PreferencesBehaviorTab::BehaviorPrefTr("Enable slider ladder"));
|
||||
slider_ladder_ = new QCheckBox(
|
||||
PreferencesBehaviorTab::BehaviorPrefTr("Enable slider ladder"));
|
||||
slider_ladder_->setChecked(OLIVE_CONFIG("UseSliderLadders").toBool());
|
||||
behavior_layout->addWidget(slider_ladder_);
|
||||
|
||||
scroll_zooms_ = new QCheckBox(PreferencesBehaviorTab::BehaviorPrefTr("Scrolling zooms by default"));
|
||||
scroll_zooms_ = new QCheckBox(PreferencesBehaviorTab::BehaviorPrefTr(
|
||||
"Scrolling zooms by default"));
|
||||
scroll_zooms_->setToolTip(PreferencesBehaviorTab::BehaviorPrefTr(
|
||||
"By default, scrolling will move the view around, and holding Ctrl/Cmd will make it zoom instead. "
|
||||
"Enabling this will switch those, scrolling will zoom by default, and holding Ctrl/Cmd will move the view instead."));
|
||||
|
||||
@@ -15,8 +15,8 @@
|
||||
# along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||
|
||||
set(OLIVE_SOURCES
|
||||
${OLIVE_SOURCES}
|
||||
dialog/progress/progress.h
|
||||
dialog/progress/progress.cpp
|
||||
PARENT_SCOPE
|
||||
${OLIVE_SOURCES}
|
||||
dialog/progress/progress.h
|
||||
dialog/progress/progress.cpp
|
||||
PARENT_SCOPE
|
||||
)
|
||||
|
||||
@@ -15,8 +15,8 @@
|
||||
# along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||
|
||||
set(OLIVE_SOURCES
|
||||
${OLIVE_SOURCES}
|
||||
dialog/projectproperties/projectproperties.h
|
||||
dialog/projectproperties/projectproperties.cpp
|
||||
PARENT_SCOPE
|
||||
${OLIVE_SOURCES}
|
||||
dialog/projectproperties/projectproperties.h
|
||||
dialog/projectproperties/projectproperties.cpp
|
||||
PARENT_SCOPE
|
||||
)
|
||||
|
||||
@@ -15,8 +15,8 @@
|
||||
# along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||
|
||||
set(OLIVE_SOURCES
|
||||
${OLIVE_SOURCES}
|
||||
dialog/rendercancel/rendercancel.h
|
||||
dialog/rendercancel/rendercancel.cpp
|
||||
PARENT_SCOPE
|
||||
${OLIVE_SOURCES}
|
||||
dialog/rendercancel/rendercancel.h
|
||||
dialog/rendercancel/rendercancel.cpp
|
||||
PARENT_SCOPE
|
||||
)
|
||||
|
||||
@@ -15,14 +15,14 @@
|
||||
# along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||
|
||||
set(OLIVE_SOURCES
|
||||
${OLIVE_SOURCES}
|
||||
dialog/sequence/presetmanager.h
|
||||
dialog/sequence/sequence.h
|
||||
dialog/sequence/sequence.cpp
|
||||
dialog/sequence/sequencedialogparametertab.h
|
||||
dialog/sequence/sequencedialogparametertab.cpp
|
||||
dialog/sequence/sequencedialogpresettab.h
|
||||
dialog/sequence/sequencedialogpresettab.cpp
|
||||
dialog/sequence/sequencepreset.h
|
||||
PARENT_SCOPE
|
||||
${OLIVE_SOURCES}
|
||||
dialog/sequence/presetmanager.h
|
||||
dialog/sequence/sequence.h
|
||||
dialog/sequence/sequence.cpp
|
||||
dialog/sequence/sequencedialogparametertab.h
|
||||
dialog/sequence/sequencedialogparametertab.cpp
|
||||
dialog/sequence/sequencedialogpresettab.h
|
||||
dialog/sequence/sequencedialogpresettab.cpp
|
||||
dialog/sequence/sequencepreset.h
|
||||
PARENT_SCOPE
|
||||
)
|
||||
|
||||
@@ -23,7 +23,6 @@
|
||||
#include <QPushButton>
|
||||
#include <QVBoxLayout>
|
||||
|
||||
|
||||
namespace olive
|
||||
{
|
||||
|
||||
|
||||
@@ -15,8 +15,8 @@
|
||||
# along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||
|
||||
set(OLIVE_SOURCES
|
||||
${OLIVE_SOURCES}
|
||||
dialog/speedduration/speeddurationdialog.cpp
|
||||
dialog/speedduration/speeddurationdialog.h
|
||||
PARENT_SCOPE
|
||||
${OLIVE_SOURCES}
|
||||
dialog/speedduration/speeddurationdialog.cpp
|
||||
dialog/speedduration/speeddurationdialog.h
|
||||
PARENT_SCOPE
|
||||
)
|
||||
|
||||
@@ -15,8 +15,8 @@
|
||||
# along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||
|
||||
set(OLIVE_SOURCES
|
||||
${OLIVE_SOURCES}
|
||||
dialog/task/task.h
|
||||
dialog/task/task.cpp
|
||||
PARENT_SCOPE
|
||||
${OLIVE_SOURCES}
|
||||
dialog/task/task.h
|
||||
dialog/task/task.cpp
|
||||
PARENT_SCOPE
|
||||
)
|
||||
|
||||
@@ -15,8 +15,8 @@
|
||||
# along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||
|
||||
set(OLIVE_SOURCES
|
||||
${OLIVE_SOURCES}
|
||||
dialog/text/text.h
|
||||
dialog/text/text.cpp
|
||||
PARENT_SCOPE
|
||||
${OLIVE_SOURCES}
|
||||
dialog/text/text.h
|
||||
dialog/text/text.cpp
|
||||
PARENT_SCOPE
|
||||
)
|
||||
|
||||
@@ -27,7 +27,6 @@
|
||||
#include <QPushButton>
|
||||
#include <QVBoxLayout>
|
||||
|
||||
|
||||
namespace olive
|
||||
{
|
||||
|
||||
|
||||
Reference in New Issue
Block a user