Browse Source

Add panic button; Fix tab look

tags/1.9.4
falkTX 12 years ago
parent
commit
ce71a5d0fe
5 changed files with 18 additions and 7 deletions
  1. BIN
      resources/16x16/dialog-warning.png
  2. +1
    -0
      resources/resources.qrc
  3. +13
    -0
      resources/ui/carla.ui
  4. +4
    -3
      source/carla.py
  5. +0
    -4
      source/theme/CarlaStyle.cpp

BIN
resources/16x16/dialog-warning.png View File

Before After
Width: 16  |  Height: 16  |  Size: 596B

+ 1
- 0
resources/resources.qrc View File

@@ -9,6 +9,7 @@
<file>16x16/dialog-error.png</file> <file>16x16/dialog-error.png</file>
<file>16x16/dialog-information.png</file> <file>16x16/dialog-information.png</file>
<file>16x16/dialog-ok-apply.png</file> <file>16x16/dialog-ok-apply.png</file>
<file>16x16/dialog-warning.png</file>
<file>16x16/document-new.png</file> <file>16x16/document-new.png</file>
<file>16x16/document-open.png</file> <file>16x16/document-open.png</file>
<file>16x16/document-print.png</file> <file>16x16/document-print.png</file>


+ 13
- 0
resources/ui/carla.ui View File

@@ -406,6 +406,7 @@
<addaction name="separator"/> <addaction name="separator"/>
<addaction name="act_plugin_add"/> <addaction name="act_plugin_add"/>
<addaction name="act_plugin_remove_all"/> <addaction name="act_plugin_remove_all"/>
<addaction name="act_plugins_panic"/>
</widget> </widget>
<action name="act_file_save"> <action name="act_file_save">
<property name="icon"> <property name="icon">
@@ -711,6 +712,18 @@
<string>Center Balance</string> <string>Center Balance</string>
</property> </property>
</action> </action>
<action name="act_plugins_panic">
<property name="icon">
<iconset resource="../resources.qrc">
<normaloff>:/16x16/dialog-warning.png</normaloff>:/16x16/dialog-warning.png</iconset>
</property>
<property name="text">
<string>Panic</string>
</property>
<property name="toolTip">
<string>Panic</string>
</property>
</action>
</widget> </widget>
<customwidgets> <customwidgets>
<customwidget> <customwidget>


+ 4
- 3
source/carla.py View File

@@ -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_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_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_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_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_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_play, SIGNAL("triggered(bool)"), SLOT("slot_transportPlayPause(bool)"))
self.connect(self.ui.act_transport_stop, SIGNAL("triggered()"), SLOT("slot_transportStop()")) self.connect(self.ui.act_transport_stop, SIGNAL("triggered()"), SLOT("slot_transportStop()"))


+ 0
- 4
source/theme/CarlaStyle.cpp View File

@@ -2154,7 +2154,6 @@ void CarlaStyle::drawControl(ControlElement element, const QStyleOption *option,
return; return;
} }


#if 0 // code does nothing?
if (flip) { if (flip) {
QRect tmp = rect; QRect tmp = rect;
rect = QRect(tmp.y(), tmp.x(), tmp.height(), tmp.width()); rect = QRect(tmp.y(), tmp.x(), tmp.height(), tmp.width());
@@ -2165,9 +2164,6 @@ void CarlaStyle::drawControl(ControlElement element, const QStyleOption *option,
x2 = y2; x2 = y2;
y2 = temp; y2 = temp;
} }
#else
Q_UNUSED(flip);
#endif


painter->setRenderHint(QPainter::Antialiasing, true); painter->setRenderHint(QPainter::Antialiasing, true);
painter->translate(0.5, 0.5); painter->translate(0.5, 0.5);


Loading…
Cancel
Save