Skip to content

Commit e48a8fa

Browse files
committed
Migration to QT5
1 parent 46714c2 commit e48a8fa

File tree

16 files changed

+378
-181
lines changed

16 files changed

+378
-181
lines changed

.gitignore

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,4 +4,4 @@
44
*.app/
55
*.mov
66
*-build
7-
Thumbs.db
7+
Thumbs.db

Info.plist

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,9 @@
77
<key>CFBundleExecutable</key>
88
<string>IanniX</string>
99
<key>CFBundleShortVersionString</key>
10-
<string>0.9.17</string>
10+
<string>0.9.18</string>
1111
<key>CFBundleVersion</key>
12-
<string>0.9.17</string>
12+
<string>0.9.18</string>
1313
<key>CFBundleIdentifier</key>
1414
<string>org.iannix.desktop</string>
1515
<key>NSHumanReadableCopyright</key>

gui/uiinspector.cpp

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -79,6 +79,8 @@ UiInspector::UiInspector(QWidget *parent) :
7979
Help::syncHelpWith(ui->easingCombo, COMMAND_CURSOR_START);
8080
Help::syncHelpWith(ui->patternLine, COMMAND_CURSOR_START);
8181

82+
Help::syncHelpWith(ui->fireTriggers, COMMAND_CURSOR_FIRE);
83+
8284
Help::syncHelpWith(ui->colorCombo1, COMMAND_COLOR_ACTIVE);
8385
Help::syncHelpWith(ui->colorCombo1, COMMAND_COLOR_ACTIVE_HUE);
8486
Help::syncHelpWith(ui->colorCombo2, COMMAND_COLOR_INACTIVE);
@@ -155,7 +157,6 @@ UiInspector::UiInspector(QWidget *parent) :
155157
ui->easingCombo->addItem(QIcon(easing.getPixmap()), tr("Easing") + QString(" %1").arg(type));
156158
}
157159

158-
159160
//Templates
160161
ui->equationTemplate->clear();
161162
addEquationTemplate("Templates", "", true);
@@ -351,6 +352,13 @@ void UiInspector::actionInfo() {
351352
Application::current->execute(QString("%1 selection %2 %3").arg(COMMAND_RESIZE).arg(ui->sizeWSpin->value()).arg(ui->sizeHSpin->value()), ExecuteSourceGui);
352353
else if((ui->patternLine == sender()) || (ui->easingCombo == sender()))
353354
Application::current->execute(QString("%1 selection %2 0 %3").arg(COMMAND_CURSOR_START).arg(ui->easingCombo->currentIndex()).arg(ui->patternLine->currentText().split(" - ").at(0)), ExecuteSourceGui);
355+
else if(ui->fireTriggers == sender()) {
356+
QString action = "";
357+
if(ui->fireTriggers->currentIndex() == 0) action = "none";
358+
else if(ui->fireTriggers->currentIndex() == 1) action = "group";
359+
else if(ui->fireTriggers->currentIndex() == 2) action = "all";
360+
Application::current->execute(QString("%1 selection %2").arg(COMMAND_CURSOR_FIRE).arg(action), ExecuteSourceGui);
361+
}
354362

355363
else if((ui->equationTemplate == sender()) && (!ui->equationTemplate->itemData(ui->equationTemplate->currentIndex()).toString().isEmpty()))
356364
Application::current->execute(QString("%1 selection %2").arg(COMMAND_CURVE_EQUATION).arg(ui->equationTemplate->itemData(ui->equationTemplate->currentIndex()).toString()), ExecuteSourceGui);
@@ -596,6 +604,7 @@ void UiInspector::refresh() {
596604
if(sender() != ui->patternLine)
597605
change(indexObject, ui->patternLine, cursor->getStart().mid(4), prevCursor->getStart().mid(4), false);
598606
change(indexObject, ui->easingCombo, cursor->getEasing(), prevCursor->getEasing());
607+
change(indexObject, ui->fireTriggers, cursor->getFireValue(), prevCursor->getFireValue());
599608
change(indexObject, ui->speedSpin, cursor->getTimeFactor(), prevCursor->getTimeFactor());
600609
change(indexObject, ui->speedFSpin, cursor->getTimeFactorF(), prevCursor->getTimeFactorF());
601610
change(indexObject, ui->cursorSpeedLock, cursor->getLockPathLength(), prevCursor->getLockPathLength());
@@ -724,6 +733,7 @@ void UiInspector::refresh() {
724733
ui->patternLine->setVisible(showCursorInfo);
725734
ui->easingLabel->setVisible(showCursorInfo);
726735
ui->easingCombo->setVisible(showCursorInfo);
736+
ui->fireTriggers->setVisible(showCursorInfo);
727737
ui->patternLabel->setVisible(showCursorInfo);
728738
ui->offsetInitialSpin->setVisible(showCursorCurveInfo);
729739
ui->offsetStartSpin->setVisible(showCursorCurveInfo);

0 commit comments

Comments
 (0)