Browse Source

Settings: Use proper icon in Engine; Don't show any settings for unknown apps

tags/v0.9.0
falkTX 12 years ago
parent
commit
56874a5da9
3 changed files with 21 additions and 10 deletions
  1. +1
    -1
      src/shared.py
  2. +17
    -7
      src/shared_settings.py
  3. +3
    -2
      src/ui/settings_app.ui

+ 1
- 1
src/shared.py View File

@@ -192,7 +192,7 @@ MIDI_CC_LIST = (
"0x5D FX 3 Depth [Chorus]", "0x5D FX 3 Depth [Chorus]",
"0x5E FX 4 Depth [Detune]", "0x5E FX 4 Depth [Detune]",
"0x5F FX 5 Depth [Phaser]" "0x5F FX 5 Depth [Phaser]"
)
)


# ------------------------------------------------------------------------------------------------------------ # ------------------------------------------------------------------------------------------------------------




+ 17
- 7
src/shared_settings.py View File

@@ -31,15 +31,15 @@ TAB_INDEX_LADISH = 2
TAB_INDEX_CARLA_ENGINE = 3 TAB_INDEX_CARLA_ENGINE = 3
TAB_INDEX_CARLA_PATHS = 4 TAB_INDEX_CARLA_PATHS = 4


# Define values here so we don't have to import full patchcanvas
CANVAS_ANTIALIASING_SMALL = 1
CANVAS_EYECANDY_SMALL = 1

# carla defines # carla defines
PROCESS_MODE_SINGLE_CLIENT = 0 PROCESS_MODE_SINGLE_CLIENT = 0
PROCESS_MODE_MULTIPLE_CLIENTS = 1 PROCESS_MODE_MULTIPLE_CLIENTS = 1
PROCESS_MODE_CONTINUOUS_RACK = 2 PROCESS_MODE_CONTINUOUS_RACK = 2


# patchcanvas defines
CANVAS_ANTIALIASING_SMALL = 1
CANVAS_EYECANDY_SMALL = 1

# ladish defines # ladish defines
LADISH_CONF_KEY_DAEMON_NOTIFY = "/org/ladish/daemon/notify" LADISH_CONF_KEY_DAEMON_NOTIFY = "/org/ladish/daemon/notify"
LADISH_CONF_KEY_DAEMON_SHELL = "/org/ladish/daemon/shell" LADISH_CONF_KEY_DAEMON_SHELL = "/org/ladish/daemon/shell"
@@ -119,6 +119,15 @@ class SettingsW(QDialog, ui_settings_app.Ui_SettingsW):
self.lw_page.hideRow(2) self.lw_page.hideRow(2)
self.lw_page.setCurrentCell(0, 0) self.lw_page.setCurrentCell(0, 0)


else:
self.lw_page.hideRow(0)
self.lw_page.hideRow(1)
self.lw_page.hideRow(2)
self.lw_page.hideRow(3)
self.lw_page.hideRow(4)
self.stackedWidget.setCurrentIndex(5)
return

self.settings = self.parent().settings self.settings = self.parent().settings
self.loadSettings() self.loadSettings()


@@ -126,9 +135,10 @@ class SettingsW(QDialog, ui_settings_app.Ui_SettingsW):
self.cb_canvas_use_opengl.setChecked(False) self.cb_canvas_use_opengl.setChecked(False)
self.cb_canvas_use_opengl.setEnabled(False) self.cb_canvas_use_opengl.setEnabled(False)


self.label_icon.setPixmap(QPixmap(":/48x48/%s" % appName))
self.lw_page.item(0, 0).setIcon(QIcon(":/48x48/%s" % appName))
self.lw_page.item(3, 0).setIcon(QIcon.fromTheme("application-x-executable", QIcon(":/48x48/exec.png")))
self.lw_page.item(0, 0).setIcon(getIcon(appName, 48))
self.lw_page.item(3, 0).setIcon(getIcon("jack", 48))
self.label_icon_main.setPixmap(getIcon(appName, 48).pixmap(48, 48))
self.label_icon_engine.setPixmap(getIcon("jack", 48).pixmap(48, 48))


self.connect(self, SIGNAL("accepted()"), SLOT("slot_saveSettings()")) self.connect(self, SIGNAL("accepted()"), SLOT("slot_saveSettings()"))
self.connect(self.b_main_def_folder_open, SIGNAL("clicked()"), SLOT("slot_getAndSetPath_project()")) self.connect(self.b_main_def_folder_open, SIGNAL("clicked()"), SLOT("slot_getAndSetPath_project()"))


+ 3
- 2
src/ui/settings_app.ui View File

@@ -236,7 +236,7 @@
</spacer> </spacer>
</item> </item>
<item> <item>
<widget class="QLabel" name="label_icon">
<widget class="QLabel" name="label_icon_main">
<property name="text"> <property name="text">
<string notr="true"/> <string notr="true"/>
</property> </property>
@@ -768,7 +768,7 @@
</spacer> </spacer>
</item> </item>
<item> <item>
<widget class="QLabel" name="label_17">
<widget class="QLabel" name="label_icon_engine">
<property name="text"> <property name="text">
<string notr="true"/> <string notr="true"/>
</property> </property>
@@ -1246,6 +1246,7 @@ Some plugins might not work properly under this mode.</string>
</item> </item>
</layout> </layout>
</widget> </widget>
<widget class="QWidget" name="page"/>
</widget> </widget>
</item> </item>
</layout> </layout>


Loading…
Cancel
Save