oak-team/oak-editor
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/olive-editor/olive

Browse Source
This commit is contained in:
itsmattkc
2018-12-29 11:30:44 +11:00
parent 4835c90028 1f2ae6094b
commit 596f3cf3e0
4 changed files with 36 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files
olive.pro
+12 -1
View File
@@ -217,6 +217,17 @@ unix:!mac {
RESOURCES += \
icons/icons.qrc
unix:!mac:isEmpty(PREFIX) {
PREFIX = /usr/local
}
unix:!mac:target.path = $$PREFIX/bin
effects.files = $$PWD/effects/*.frag $$PWD/effects/*.xml $$PWD/effects/*.vert
unix:!mac:effects.path = $$PREFIX/share/olive-editor/effects
INSTALLS += target effects
unix:!mac {
metainfo.files = $$PWD/packaging/linux/org.olivevideoeditor.Olive.appdata.xml
metainfo.path = $$PREFIX/share/metainfo
@@ -241,4 +252,4 @@ unix:!mac {
icon1024.files = $$PWD/packaging/linux/icons/1024x1024/org.olivevideoeditor.Olive.png
icon1024.path = $$PREFIX/share/icons/hicolor/1024x1024/apps
INSTALLS += metainfo desktop mime icon16 icon32 icon48 icon64 icon128 icon256 icon512 icon1024
}
}
panels/effectcontrols.cpp
+7 -7
View File
@@ -40,7 +40,7 @@ EffectControls::EffectControls(QWidget *parent) :
ui->effects_area->header = ui->headers;
ui->keyframeView->header = ui->headers;
ui->label_2->setVisible(false);
ui->lblMultipleClipsSelected->setVisible(false);
connect(ui->horizontalScrollBar, SIGNAL(valueChanged(int)), ui->headers, SLOT(set_scroll(int)));
connect(ui->horizontalScrollBar, SIGNAL(resize_move(double)), ui->keyframeView, SLOT(resize_move(double)));
@@ -215,7 +215,7 @@ void EffectControls::clear_effects(bool clear_cache) {
item->widget()->setParent(NULL);
disconnect(static_cast<CollapsibleWidget*>(item->widget()), SIGNAL(deselect_others(QWidget*)), this, SLOT(deselect_all_effects(QWidget*)));
}
ui->label_2->setVisible(false);
ui->lblMultipleClipsSelected->setVisible(false);
ui->vcontainer->setVisible(false);
ui->acontainer->setVisible(false);
ui->headers->setVisible(false);
@@ -243,7 +243,7 @@ void EffectControls::open_effect(QVBoxLayout* layout, Effect* e) {
}
void EffectControls::load_effects() {
ui->label_2->setVisible(multiple);
ui->lblMultipleClipsSelected->setVisible(multiple);
if (!multiple) {
// load in new clips
@@ -315,19 +315,19 @@ void EffectControls::set_clips(QVector<int>& clips, int m) {
load_effects();
}
void EffectControls::on_add_video_effect_button_clicked() {
void EffectControls::on_btnAddVideoEffect_clicked() {
show_effect_menu(EFFECT_TYPE_EFFECT, EFFECT_TYPE_VIDEO);
}
void EffectControls::on_add_audio_effect_button_clicked() {
void EffectControls::on_btnAddAudioEffect_clicked() {
show_effect_menu(EFFECT_TYPE_EFFECT, EFFECT_TYPE_AUDIO);
}
void EffectControls::on_add_video_transition_button_clicked() {
void EffectControls::on_btnAddVideoTransition_clicked() {
show_effect_menu(EFFECT_TYPE_TRANSITION, EFFECT_TYPE_VIDEO);
}
void EffectControls::on_add_audio_transition_button_clicked() {
void EffectControls::on_btnAddAudioTransition_clicked() {
show_effect_menu(EFFECT_TYPE_TRANSITION, EFFECT_TYPE_AUDIO);
}
panels/effectcontrols.h
+6 -5
View File
@@ -52,12 +52,13 @@ public slots:
void update_keyframes();
private slots:
void menu_select(QAction* q);
void on_add_video_effect_button_clicked();
void on_add_audio_effect_button_clicked();
void deselect_all_effects(QWidget*);
void on_add_video_transition_button_clicked();
void on_add_audio_transition_button_clicked();
void on_btnAddVideoEffect_clicked();
void on_btnAddAudioEffect_clicked();
void on_btnAddVideoTransition_clicked();
void on_btnAddAudioTransition_clicked();
void deselect_all_effects(QWidget*);
protected:
void resizeEvent(QResizeEvent *event);
private:
panels/effectcontrols.ui
+11 -11
View File
@@ -151,7 +151,7 @@
<number>0</number>
</property>
<item>
<widget class="QPushButton" name="add_video_effect_button">
<widget class="QPushButton" name="btnAddVideoEffect">
<property name="toolTip">
<string>Add Video Effect</string>
</property>
@@ -166,7 +166,7 @@
</widget>
</item>
<item>
<spacer name="horizontalSpacer">
<spacer name="hsLeftVideoEffects">
<property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
@@ -179,7 +179,7 @@
</spacer>
</item>
<item>
<widget class="QLabel" name="label">
<widget class="QLabel" name="lblVideoEffects">
<property name="sizePolicy">
<sizepolicy hsizetype="Preferred" vsizetype="Maximum">
<horstretch>0</horstretch>
@@ -200,7 +200,7 @@
</widget>
</item>
<item>
<spacer name="horizontalSpacer_2">
<spacer name="hsRightVideoEffects">
<property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
@@ -213,7 +213,7 @@
</spacer>
</item>
<item>
<widget class="QPushButton" name="add_video_transition_button">
<widget class="QPushButton" name="btnAddVideoTransition">
<property name="toolTip">
<string>Add Video Transition</string>
</property>
@@ -296,7 +296,7 @@
<number>0</number>
</property>
<item>
<widget class="QPushButton" name="add_audio_effect_button">
<widget class="QPushButton" name="btnAddAudioEffect">
<property name="toolTip">
<string>Add Audio Effect</string>
</property>
@@ -311,7 +311,7 @@
</widget>
</item>
<item>
<spacer name="horizontalSpacer_3">
<spacer name="hsLeftAudioEffects">
<property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
@@ -324,7 +324,7 @@
</spacer>
</item>
<item>
<widget class="QLabel" name="label_3">
<widget class="QLabel" name="lblAudioEffects">
<property name="sizePolicy">
<sizepolicy hsizetype="Preferred" vsizetype="Maximum">
<horstretch>0</horstretch>
@@ -345,7 +345,7 @@
</widget>
</item>
<item>
<spacer name="horizontalSpacer_4">
<spacer name="hsRightAudioEffects">
<property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
@@ -358,7 +358,7 @@
</spacer>
</item>
<item>
<widget class="QPushButton" name="add_audio_transition_button">
<widget class="QPushButton" name="btnAddAudioTransition">
<property name="toolTip">
<string>Add Audio Transition</string>
</property>
@@ -400,7 +400,7 @@
</widget>
</item>
<item>
<widget class="QLabel" name="label_2">
<widget class="QLabel" name="lblMultipleClipsSelected">
<property name="text">
<string>(Multiple clips selected)</string>
</property>