Merge branch 'master' of https://github.com/olive-editor/olive
This commit is contained in:
@@ -217,6 +217,17 @@ unix:!mac {
|
|||||||
RESOURCES += \
|
RESOURCES += \
|
||||||
icons/icons.qrc
|
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 {
|
unix:!mac {
|
||||||
metainfo.files = $$PWD/packaging/linux/org.olivevideoeditor.Olive.appdata.xml
|
metainfo.files = $$PWD/packaging/linux/org.olivevideoeditor.Olive.appdata.xml
|
||||||
metainfo.path = $$PREFIX/share/metainfo
|
metainfo.path = $$PREFIX/share/metainfo
|
||||||
|
|||||||
@@ -40,7 +40,7 @@ EffectControls::EffectControls(QWidget *parent) :
|
|||||||
ui->effects_area->header = ui->headers;
|
ui->effects_area->header = ui->headers;
|
||||||
ui->keyframeView->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(valueChanged(int)), ui->headers, SLOT(set_scroll(int)));
|
||||||
connect(ui->horizontalScrollBar, SIGNAL(resize_move(double)), ui->keyframeView, SLOT(resize_move(double)));
|
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);
|
item->widget()->setParent(NULL);
|
||||||
disconnect(static_cast<CollapsibleWidget*>(item->widget()), SIGNAL(deselect_others(QWidget*)), this, SLOT(deselect_all_effects(QWidget*)));
|
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->vcontainer->setVisible(false);
|
||||||
ui->acontainer->setVisible(false);
|
ui->acontainer->setVisible(false);
|
||||||
ui->headers->setVisible(false);
|
ui->headers->setVisible(false);
|
||||||
@@ -243,7 +243,7 @@ void EffectControls::open_effect(QVBoxLayout* layout, Effect* e) {
|
|||||||
}
|
}
|
||||||
|
|
||||||
void EffectControls::load_effects() {
|
void EffectControls::load_effects() {
|
||||||
ui->label_2->setVisible(multiple);
|
ui->lblMultipleClipsSelected->setVisible(multiple);
|
||||||
|
|
||||||
if (!multiple) {
|
if (!multiple) {
|
||||||
// load in new clips
|
// load in new clips
|
||||||
@@ -315,19 +315,19 @@ void EffectControls::set_clips(QVector<int>& clips, int m) {
|
|||||||
load_effects();
|
load_effects();
|
||||||
}
|
}
|
||||||
|
|
||||||
void EffectControls::on_add_video_effect_button_clicked() {
|
void EffectControls::on_btnAddVideoEffect_clicked() {
|
||||||
show_effect_menu(EFFECT_TYPE_EFFECT, EFFECT_TYPE_VIDEO);
|
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);
|
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);
|
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);
|
show_effect_menu(EFFECT_TYPE_TRANSITION, EFFECT_TYPE_AUDIO);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -52,12 +52,13 @@ public slots:
|
|||||||
void update_keyframes();
|
void update_keyframes();
|
||||||
private slots:
|
private slots:
|
||||||
void menu_select(QAction* q);
|
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_btnAddVideoEffect_clicked();
|
||||||
void on_add_audio_transition_button_clicked();
|
void on_btnAddAudioEffect_clicked();
|
||||||
|
void on_btnAddVideoTransition_clicked();
|
||||||
|
void on_btnAddAudioTransition_clicked();
|
||||||
|
|
||||||
|
void deselect_all_effects(QWidget*);
|
||||||
protected:
|
protected:
|
||||||
void resizeEvent(QResizeEvent *event);
|
void resizeEvent(QResizeEvent *event);
|
||||||
private:
|
private:
|
||||||
|
|||||||
+11
-11
@@ -151,7 +151,7 @@
|
|||||||
<number>0</number>
|
<number>0</number>
|
||||||
</property>
|
</property>
|
||||||
<item>
|
<item>
|
||||||
<widget class="QPushButton" name="add_video_effect_button">
|
<widget class="QPushButton" name="btnAddVideoEffect">
|
||||||
<property name="toolTip">
|
<property name="toolTip">
|
||||||
<string>Add Video Effect</string>
|
<string>Add Video Effect</string>
|
||||||
</property>
|
</property>
|
||||||
@@ -166,7 +166,7 @@
|
|||||||
</widget>
|
</widget>
|
||||||
</item>
|
</item>
|
||||||
<item>
|
<item>
|
||||||
<spacer name="horizontalSpacer">
|
<spacer name="hsLeftVideoEffects">
|
||||||
<property name="orientation">
|
<property name="orientation">
|
||||||
<enum>Qt::Horizontal</enum>
|
<enum>Qt::Horizontal</enum>
|
||||||
</property>
|
</property>
|
||||||
@@ -179,7 +179,7 @@
|
|||||||
</spacer>
|
</spacer>
|
||||||
</item>
|
</item>
|
||||||
<item>
|
<item>
|
||||||
<widget class="QLabel" name="label">
|
<widget class="QLabel" name="lblVideoEffects">
|
||||||
<property name="sizePolicy">
|
<property name="sizePolicy">
|
||||||
<sizepolicy hsizetype="Preferred" vsizetype="Maximum">
|
<sizepolicy hsizetype="Preferred" vsizetype="Maximum">
|
||||||
<horstretch>0</horstretch>
|
<horstretch>0</horstretch>
|
||||||
@@ -200,7 +200,7 @@
|
|||||||
</widget>
|
</widget>
|
||||||
</item>
|
</item>
|
||||||
<item>
|
<item>
|
||||||
<spacer name="horizontalSpacer_2">
|
<spacer name="hsRightVideoEffects">
|
||||||
<property name="orientation">
|
<property name="orientation">
|
||||||
<enum>Qt::Horizontal</enum>
|
<enum>Qt::Horizontal</enum>
|
||||||
</property>
|
</property>
|
||||||
@@ -213,7 +213,7 @@
|
|||||||
</spacer>
|
</spacer>
|
||||||
</item>
|
</item>
|
||||||
<item>
|
<item>
|
||||||
<widget class="QPushButton" name="add_video_transition_button">
|
<widget class="QPushButton" name="btnAddVideoTransition">
|
||||||
<property name="toolTip">
|
<property name="toolTip">
|
||||||
<string>Add Video Transition</string>
|
<string>Add Video Transition</string>
|
||||||
</property>
|
</property>
|
||||||
@@ -296,7 +296,7 @@
|
|||||||
<number>0</number>
|
<number>0</number>
|
||||||
</property>
|
</property>
|
||||||
<item>
|
<item>
|
||||||
<widget class="QPushButton" name="add_audio_effect_button">
|
<widget class="QPushButton" name="btnAddAudioEffect">
|
||||||
<property name="toolTip">
|
<property name="toolTip">
|
||||||
<string>Add Audio Effect</string>
|
<string>Add Audio Effect</string>
|
||||||
</property>
|
</property>
|
||||||
@@ -311,7 +311,7 @@
|
|||||||
</widget>
|
</widget>
|
||||||
</item>
|
</item>
|
||||||
<item>
|
<item>
|
||||||
<spacer name="horizontalSpacer_3">
|
<spacer name="hsLeftAudioEffects">
|
||||||
<property name="orientation">
|
<property name="orientation">
|
||||||
<enum>Qt::Horizontal</enum>
|
<enum>Qt::Horizontal</enum>
|
||||||
</property>
|
</property>
|
||||||
@@ -324,7 +324,7 @@
|
|||||||
</spacer>
|
</spacer>
|
||||||
</item>
|
</item>
|
||||||
<item>
|
<item>
|
||||||
<widget class="QLabel" name="label_3">
|
<widget class="QLabel" name="lblAudioEffects">
|
||||||
<property name="sizePolicy">
|
<property name="sizePolicy">
|
||||||
<sizepolicy hsizetype="Preferred" vsizetype="Maximum">
|
<sizepolicy hsizetype="Preferred" vsizetype="Maximum">
|
||||||
<horstretch>0</horstretch>
|
<horstretch>0</horstretch>
|
||||||
@@ -345,7 +345,7 @@
|
|||||||
</widget>
|
</widget>
|
||||||
</item>
|
</item>
|
||||||
<item>
|
<item>
|
||||||
<spacer name="horizontalSpacer_4">
|
<spacer name="hsRightAudioEffects">
|
||||||
<property name="orientation">
|
<property name="orientation">
|
||||||
<enum>Qt::Horizontal</enum>
|
<enum>Qt::Horizontal</enum>
|
||||||
</property>
|
</property>
|
||||||
@@ -358,7 +358,7 @@
|
|||||||
</spacer>
|
</spacer>
|
||||||
</item>
|
</item>
|
||||||
<item>
|
<item>
|
||||||
<widget class="QPushButton" name="add_audio_transition_button">
|
<widget class="QPushButton" name="btnAddAudioTransition">
|
||||||
<property name="toolTip">
|
<property name="toolTip">
|
||||||
<string>Add Audio Transition</string>
|
<string>Add Audio Transition</string>
|
||||||
</property>
|
</property>
|
||||||
@@ -400,7 +400,7 @@
|
|||||||
</widget>
|
</widget>
|
||||||
</item>
|
</item>
|
||||||
<item>
|
<item>
|
||||||
<widget class="QLabel" name="label_2">
|
<widget class="QLabel" name="lblMultipleClipsSelected">
|
||||||
<property name="text">
|
<property name="text">
|
||||||
<string>(Multiple clips selected)</string>
|
<string>(Multiple clips selected)</string>
|
||||||
</property>
|
</property>
|
||||||
|
|||||||
Reference in New Issue
Block a user