Browse Source

Fixing

tags/1.9.4
falkTX 12 years ago
parent
commit
95a41a490a
2 changed files with 24 additions and 3 deletions
  1. +21
    -0
      resources/ui/carla.ui
  2. +3
    -3
      source/carla.py

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

@@ -20,10 +20,16 @@
<layout class="QVBoxLayout" name="verticalLayout_5">
<item>
<widget class="QSplitter" name="splitter">
<property name="acceptDrops">
<bool>false</bool>
</property>
<property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
<widget class="QTabWidget" name="tabMain">
<property name="acceptDrops">
<bool>true</bool>
</property>
<property name="currentIndex">
<number>0</number>
</property>
@@ -149,6 +155,9 @@
<height>0</height>
</size>
</property>
<property name="acceptDrops">
<bool>false</bool>
</property>
<property name="tabPosition">
<enum>QTabWidget::East</enum>
</property>
@@ -156,6 +165,9 @@
<number>0</number>
</property>
<widget class="QWidget" name="disk">
<property name="acceptDrops">
<bool>false</bool>
</property>
<attribute name="title">
<string>Disk</string>
</attribute>
@@ -177,9 +189,15 @@
</property>
<item>
<widget class="QTreeView" name="fileTreeView">
<property name="editTriggers">
<set>QAbstractItemView::NoEditTriggers</set>
</property>
<property name="dragEnabled">
<bool>true</bool>
</property>
<property name="dragDropMode">
<enum>QAbstractItemView::DragDrop</enum>
</property>
</widget>
</item>
</layout>
@@ -200,6 +218,9 @@
<height>162</height>
</size>
</property>
<property name="acceptDrops">
<bool>false</bool>
</property>
<property name="frameShape">
<enum>QFrame::StyledPanel</enum>
</property>


+ 3
- 3
source/carla.py View File

@@ -1748,7 +1748,7 @@ class CarlaMainW(QMainWindow):
def dragEnterEvent(self, event):
if event.source() == self.ui.fileTreeView:
event.accept()
elif self.ui.tabMain.currentIndex() == 0 and self.ui.tab_plugins.contentsRect().contains(event.pos()):
elif self.ui.tabMain.contentsRect().contains(event.pos()):
event.accept()
else:
QMainWindow.dragEnterEvent(self, event)
@@ -1763,8 +1763,8 @@ class CarlaMainW(QMainWindow):

if not Carla.host.load_filename(filename):
CustomMessageBox(self, QMessageBox.Critical, self.tr("Error"),
self.tr("Failed to load file"),
cString(Carla.host.get_last_error()), QMessageBox.Ok, QMessageBox.Ok)
self.tr("Failed to load file"),
cString(Carla.host.get_last_error()), QMessageBox.Ok, QMessageBox.Ok)

def resizeEvent(self, event):
if self.ui.tabMain.currentIndex() == 0:


Loading…
Cancel
Save