Commit 5f512878 authored by Jürgen Herrmann's avatar Jürgen Herrmann

fixed essential stylesheets, broken ones are minor nuisances

fixed tab ordering in main window
parent 8335772c
......@@ -5,17 +5,17 @@ insert/remove/apply dance:
if inserted, edit default.pa to automatically load module with parameters
if not inserted, edit default.pa and remove loading of ladspa-sink-module
stylesheets, fix currently broken:
ToolTips
QInputDialog
QComboBox(Items)
ToolTips (font color -> black or darker bg)
QComboBox(SelectedItem) font color black -> white
speed up application startup (?)
speed up drawing frequency response graph
ladspa plugin: triple band param. eq with shelve:
get ids assigned?
done:
=====
stylesheets, fix currently broken:
QInputDialog
QComboBox(Items in Dropdown)
storing/loading presets
do not load presets while repopulating dropdown
on dirty set currentindex of dropdown to 0 and set name of loaded preset to ""
......
......@@ -24,6 +24,7 @@ class MainWindow(QtGui.QMainWindow, Ui_MainWindow):
def __init__(self):
super(MainWindow, self).__init__()
self.setupUi(self)
self.setStyleSheet(GLOBAL_CSS)
self._prohibitLineEditUpdates = False
self._disablePresetsComboboxHandler = False
self._loadedPresetName = ""
......
......@@ -76,7 +76,16 @@ class Ui_MainWindow(object):
font.setBold(True)
font.setWeight(75)
self.comboBoxPresets.setFont(font)
self.comboBoxPresets.setStyleSheet(_fromUtf8("background-color: #aaaaaa"))
self.comboBoxPresets.setStyleSheet(_fromUtf8("background-color: #666;\n"
"color: #fff;\n"
"selection-color: #fff;\n"
"QComboBox QAbstractItemView {\n"
" selection-color: #fff;\n"
" color: #ffff;\n"
" selection-background-color: #00dd00;\n"
" background-color: #666;\n"
"}\n"
""))
self.comboBoxPresets.setObjectName(_fromUtf8("comboBoxPresets"))
self.horizontalLayout.addWidget(self.comboBoxPresets)
self.pushButtonSavePreset = QtGui.QPushButton(self.centralwidget)
......@@ -85,7 +94,7 @@ class Ui_MainWindow(object):
font.setBold(True)
font.setWeight(75)
self.pushButtonSavePreset.setFont(font)
self.pushButtonSavePreset.setStyleSheet(_fromUtf8("background-color: #666; color: white"))
self.pushButtonSavePreset.setStyleSheet(_fromUtf8("background-color: #666; color: white;"))
self.pushButtonSavePreset.setObjectName(_fromUtf8("pushButtonSavePreset"))
self.horizontalLayout.addWidget(self.pushButtonSavePreset)
self.labelGain = QtGui.QLabel(self.centralwidget)
......@@ -546,14 +555,53 @@ class Ui_MainWindow(object):
self.retranslateUi(MainWindow)
QtCore.QMetaObject.connectSlotsByName(MainWindow)
MainWindow.setTabOrder(self.pushButtonBypass, self.pushButtonInsert)
MainWindow.setTabOrder(self.pushButtonInsert, self.comboBoxPresets)
MainWindow.setTabOrder(self.comboBoxPresets, self.pushButtonSavePreset)
MainWindow.setTabOrder(self.pushButtonSavePreset, self.sliderGain)
MainWindow.setTabOrder(self.sliderGain, self.pushButtonAbout)
MainWindow.setTabOrder(self.pushButtonAbout, self.dialFrequencyLow)
MainWindow.setTabOrder(self.dialFrequencyLow, self.lineEditFrequencyLow)
MainWindow.setTabOrder(self.lineEditFrequencyLow, self.dialGainLow)
MainWindow.setTabOrder(self.dialGainLow, self.lineEditGainLow)
MainWindow.setTabOrder(self.lineEditGainLow, self.dialQLow)
MainWindow.setTabOrder(self.dialQLow, self.lineEditQLow)
MainWindow.setTabOrder(self.lineEditQLow, self.dialFrequencyParam1)
MainWindow.setTabOrder(self.dialFrequencyParam1, self.lineEditFrequencyParam1)
MainWindow.setTabOrder(self.lineEditFrequencyParam1, self.dialGainParam1)
MainWindow.setTabOrder(self.dialGainParam1, self.lineEditGainParam1)
MainWindow.setTabOrder(self.lineEditGainParam1, self.dialQParam1)
MainWindow.setTabOrder(self.dialQParam1, self.lineEditQParam1)
MainWindow.setTabOrder(self.lineEditQParam1, self.dialFrequencyParam2)
MainWindow.setTabOrder(self.dialFrequencyParam2, self.lineEditFrequencyParam2)
MainWindow.setTabOrder(self.lineEditFrequencyParam2, self.dialGainParam2)
MainWindow.setTabOrder(self.dialGainParam2, self.lineEditGainParam2)
MainWindow.setTabOrder(self.lineEditGainParam2, self.dialQParam2)
MainWindow.setTabOrder(self.dialQParam2, self.lineEditQParam2)
MainWindow.setTabOrder(self.lineEditQParam2, self.dialFrequencyParam3)
MainWindow.setTabOrder(self.dialFrequencyParam3, self.lineEditFrequencyParam3)
MainWindow.setTabOrder(self.lineEditFrequencyParam3, self.dialGainParam3)
MainWindow.setTabOrder(self.dialGainParam3, self.lineEditGainParam3)
MainWindow.setTabOrder(self.lineEditGainParam3, self.dialQParam3)
MainWindow.setTabOrder(self.dialQParam3, self.lineEditQParam3)
MainWindow.setTabOrder(self.lineEditQParam3, self.dialFrequencyHigh)
MainWindow.setTabOrder(self.dialFrequencyHigh, self.lineEditFrequencyHigh)
MainWindow.setTabOrder(self.lineEditFrequencyHigh, self.dialGainHigh)
MainWindow.setTabOrder(self.dialGainHigh, self.lineEditGainHigh)
MainWindow.setTabOrder(self.lineEditGainHigh, self.dialQHigh)
MainWindow.setTabOrder(self.dialQHigh, self.lineEditQHigh)
def retranslateUi(self, MainWindow):
MainWindow.setWindowTitle(_translate("MainWindow", "Pulseaudio Parametric Equalizer", None))
self.pushButtonBypass.setToolTip(_translate("MainWindow", "Bypass the Euqalizer", None))
self.pushButtonBypass.setText(_translate("MainWindow", "Bypass", None))
self.pushButtonInsert.setToolTip(_translate("MainWindow", "Insert/Remove LADSPA filter module to pulseaudio", None))
self.pushButtonInsert.setText(_translate("MainWindow", "Insert", None))
self.labelPreset.setText(_translate("MainWindow", "Preset:", None))
self.pushButtonSavePreset.setToolTip(_translate("MainWindow", "Save the current equalizer as a preset...", None))
self.pushButtonSavePreset.setText(_translate("MainWindow", "Save...", None))
self.labelGain.setText(_translate("MainWindow", "Gain: 0.0dB", None))
self.pushButtonAbout.setToolTip(_translate("MainWindow", "About this application", None))
self.pushButtonAbout.setText(_translate("MainWindow", "About", None))
self.labelFrGraph.setText(_translate("MainWindow", "GFX", None))
self.labelFrequencyLow.setText(_translate("MainWindow", "Frequency:", None))
......
......@@ -48,6 +48,9 @@
<bold>true</bold>
</font>
</property>
<property name="toolTip">
<string>Bypass the Euqalizer</string>
</property>
<property name="styleSheet">
<string notr="true">background-color: #cc0000; color: white</string>
</property>
......@@ -68,6 +71,9 @@
<bold>true</bold>
</font>
</property>
<property name="toolTip">
<string>Insert/Remove LADSPA filter module to pulseaudio</string>
</property>
<property name="styleSheet">
<string notr="true">background-color: #060; color: white</string>
</property>
......@@ -109,7 +115,16 @@
</font>
</property>
<property name="styleSheet">
<string notr="true">background-color: #aaaaaa</string>
<string notr="true">background-color: #666;
color: #fff;
selection-color: #fff;
QComboBox QAbstractItemView {
selection-color: #fff;
color: #ffff;
selection-background-color: #00dd00;
background-color: #666;
}
</string>
</property>
</widget>
</item>
......@@ -122,8 +137,11 @@
<bold>true</bold>
</font>
</property>
<property name="toolTip">
<string>Save the current equalizer as a preset...</string>
</property>
<property name="styleSheet">
<string notr="true">background-color: #666; color: white</string>
<string notr="true">background-color: #666; color: white;</string>
</property>
<property name="text">
<string>Save...</string>
......@@ -163,6 +181,9 @@
<bold>true</bold>
</font>
</property>
<property name="toolTip">
<string>About this application</string>
</property>
<property name="styleSheet">
<string notr="true">background-color: #666; color: white</string>
</property>
......@@ -1046,6 +1067,44 @@
</layout>
</widget>
</widget>
<tabstops>
<tabstop>pushButtonBypass</tabstop>
<tabstop>pushButtonInsert</tabstop>
<tabstop>comboBoxPresets</tabstop>
<tabstop>pushButtonSavePreset</tabstop>
<tabstop>sliderGain</tabstop>
<tabstop>pushButtonAbout</tabstop>
<tabstop>dialFrequencyLow</tabstop>
<tabstop>lineEditFrequencyLow</tabstop>
<tabstop>dialGainLow</tabstop>
<tabstop>lineEditGainLow</tabstop>
<tabstop>dialQLow</tabstop>
<tabstop>lineEditQLow</tabstop>
<tabstop>dialFrequencyParam1</tabstop>
<tabstop>lineEditFrequencyParam1</tabstop>
<tabstop>dialGainParam1</tabstop>
<tabstop>lineEditGainParam1</tabstop>
<tabstop>dialQParam1</tabstop>
<tabstop>lineEditQParam1</tabstop>
<tabstop>dialFrequencyParam2</tabstop>
<tabstop>lineEditFrequencyParam2</tabstop>
<tabstop>dialGainParam2</tabstop>
<tabstop>lineEditGainParam2</tabstop>
<tabstop>dialQParam2</tabstop>
<tabstop>lineEditQParam2</tabstop>
<tabstop>dialFrequencyParam3</tabstop>
<tabstop>lineEditFrequencyParam3</tabstop>
<tabstop>dialGainParam3</tabstop>
<tabstop>lineEditGainParam3</tabstop>
<tabstop>dialQParam3</tabstop>
<tabstop>lineEditQParam3</tabstop>
<tabstop>dialFrequencyHigh</tabstop>
<tabstop>lineEditFrequencyHigh</tabstop>
<tabstop>dialGainHigh</tabstop>
<tabstop>lineEditGainHigh</tabstop>
<tabstop>dialQHigh</tabstop>
<tabstop>lineEditQHigh</tabstop>
</tabstops>
<resources>
<include location="res/PAPEq.qrc"/>
</resources>
......
......@@ -16,10 +16,6 @@ FREQUENCY_DEFAULTS = {
GLOBAL_CSS = """
background-color: #333;
color: white;
QWidget {
color: white;
background-color: #333:
}
QLabel {
color: white;
}
......@@ -40,13 +36,16 @@ QMessageBox > QPushButton {
color: white;
background-color: #555;
}
// does not work...
//QWidget > QToolTip {
// background-color: yellow;
// color: black;
//}
QToolTip {
border: 1px solid #ff0000;
border-radius: 4px;
padding: 2px;
background: #aaffaa;
color: #000000;
}
"""
GRAPH_FREQUS = []
_f = 0.001
while _f < math.pi:
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment