From ce71a5d0fe6bd389b0b6a386eeaa1e4716ffcf47 Mon Sep 17 00:00:00 2001 From: falkTX Date: Mon, 29 Apr 2013 11:23:27 +0100 Subject: [PATCH] Add panic button; Fix tab look --- resources/16x16/dialog-warning.png | Bin 0 -> 596 bytes resources/resources.qrc | 1 + resources/ui/carla.ui | 13 +++++++++++++ source/carla.py | 7 ++++--- source/theme/CarlaStyle.cpp | 4 ---- 5 files changed, 18 insertions(+), 7 deletions(-) create mode 100644 resources/16x16/dialog-warning.png diff --git a/resources/16x16/dialog-warning.png b/resources/16x16/dialog-warning.png new file mode 100644 index 0000000000000000000000000000000000000000..43ca31a31871751e291ed4ae0a43e2d98cdf0b74 GIT binary patch literal 596 zcmV-a0;~OrP)=*gEtt=qgkZ2WcrqY7(0?$^FO?a>2XUw9*HDa1NaF z@OuwOwASng#Q>tJeKmRSTwoAd>whL*v@S-Ar+U%SIo(~bF70$q?I;f2hvwL{7^U;b zw*BD0M(BMqro}&V2*W@OP{GO3=%amW&w?cO?-~auS$=Y#<)@EOh2!YhoZXWkUa;=S z@ZZX3l4u!f_gAJi&FE}$2CGXn*ks=8+cm7Eys zU~b|CdHj)4a9W7hL>0$^_B%BP8QDjACRVHHHinKSo>&nW@cmT@orH{EYk+`G9GahX zI~Wi1Oy~%}gp}rxJT?oiC;2*<^i#R|~)W-VQBrF&w4GR~1a&85xL*&7(@?XNdKu7s+>4 ix2BaJzs}xZAN&D5t-?v>AdPzf000016x16/dialog-error.png 16x16/dialog-information.png 16x16/dialog-ok-apply.png + 16x16/dialog-warning.png 16x16/document-new.png 16x16/document-open.png 16x16/document-print.png diff --git a/resources/ui/carla.ui b/resources/ui/carla.ui index 989fdcac8..27b96dbf0 100644 --- a/resources/ui/carla.ui +++ b/resources/ui/carla.ui @@ -406,6 +406,7 @@ + @@ -711,6 +712,18 @@ Center Balance + + + + :/16x16/dialog-warning.png:/16x16/dialog-warning.png + + + Panic + + + Panic + + diff --git a/source/carla.py b/source/carla.py index 1a851e407..6dd0edafe 100755 --- a/source/carla.py +++ b/source/carla.py @@ -773,12 +773,13 @@ class CarlaMainW(QMainWindow): self.connect(self.ui.act_plugin_remove_all, SIGNAL("triggered()"), SLOT("slot_pluginRemoveAll()")) self.connect(self.ui.act_plugins_enable, SIGNAL("triggered()"), SLOT("slot_pluginsEnable()")) - self.connect(self.ui.act_plugins_volume100, SIGNAL("triggered()"), SLOT("slot_pluginsVolume100()")) - self.connect(self.ui.act_plugins_wet100, SIGNAL("triggered()"), SLOT("slot_pluginsWet100()")) - self.connect(self.ui.act_plugins_center, SIGNAL("triggered()"), SLOT("slot_pluginsCenter()")) self.connect(self.ui.act_plugins_disable, SIGNAL("triggered()"), SLOT("slot_pluginsDisable()")) + self.connect(self.ui.act_plugins_panic, SIGNAL("triggered()"), SLOT("slot_pluginsDisable()")) + self.connect(self.ui.act_plugins_volume100, SIGNAL("triggered()"), SLOT("slot_pluginsVolume100()")) self.connect(self.ui.act_plugins_mute, SIGNAL("triggered()"), SLOT("slot_pluginsMute()")) + self.connect(self.ui.act_plugins_wet100, SIGNAL("triggered()"), SLOT("slot_pluginsWet100()")) self.connect(self.ui.act_plugins_bypass, SIGNAL("triggered()"), SLOT("slot_pluginsBypass()")) + self.connect(self.ui.act_plugins_center, SIGNAL("triggered()"), SLOT("slot_pluginsCenter()")) self.connect(self.ui.act_transport_play, SIGNAL("triggered(bool)"), SLOT("slot_transportPlayPause(bool)")) self.connect(self.ui.act_transport_stop, SIGNAL("triggered()"), SLOT("slot_transportStop()")) diff --git a/source/theme/CarlaStyle.cpp b/source/theme/CarlaStyle.cpp index 744413c2a..eb976207e 100644 --- a/source/theme/CarlaStyle.cpp +++ b/source/theme/CarlaStyle.cpp @@ -2154,7 +2154,6 @@ void CarlaStyle::drawControl(ControlElement element, const QStyleOption *option, return; } -#if 0 // code does nothing? if (flip) { QRect tmp = rect; rect = QRect(tmp.y(), tmp.x(), tmp.height(), tmp.width()); @@ -2165,9 +2164,6 @@ void CarlaStyle::drawControl(ControlElement element, const QStyleOption *option, x2 = y2; y2 = temp; } -#else - Q_UNUSED(flip); -#endif painter->setRenderHint(QPainter::Antialiasing, true); painter->translate(0.5, 0.5);