mirror/projectm
3
0
Fork 0
mirror of https://github.com/projectM-visualizer/projectm.git synced 2026-05-05 21:04:38 +00:00
Code Issues Projects Releases Wiki Activity

resize behavior fixed on pulse audio device chooser dialog (and default size is a bit larger)

Browse Source 
name / comment updates to pulseaudio desktop file 


git-svn-id: https://projectm.svn.sourceforge.net/svnroot/projectm/trunk@951 6778bc44-b910-0410-a7a0-be141de4315d
This commit is contained in:
w1z7ard
2008-04-10 07:01:36 +00:00
parent af3084dfab
commit 4eb9c2ad23
4 changed files with 71 additions and 69 deletions
Download Patch File Download Diff File Expand all files Collapse all files

112
src/projectM-pulseaudio/PulseDeviceChooserDialog.ui
View File

@ -5,79 +5,71 @@
<rect>
<x>0</x>
<y>0</y>
<width>378</width>
<height>243</height>
<width>380</width>
<height>271</height>
</rect>
</property>
<property name="windowTitle" >
<string>Pulse Audio Settings</string>
</property>
<widget class="QDialogButtonBox" name="buttonBox" >
<widget class="QWidget" name="layoutWidget" >
<property name="geometry" >
<rect>
<x>290</x>
<y>20</y>
<width>81</width>
<height>241</height>
</rect>
</property>
<property name="orientation" >
<enum>Qt::Vertical</enum>
</property>
<property name="standardButtons" >
<set>QDialogButtonBox::Ok</set>
</property>
</widget>
<widget class="QCheckBox" name="tryFirstPlayBackMonitorCheckBox" >
<property name="geometry" >
<rect>
<x>20</x>
<y>210</y>
<width>251</width>
<height>24</height>
</rect>
</property>
<property name="toolTip" >
<string>This will try to find any available playback monitor on startup as the pulseaudio source device. This is a quick and dirty way to generally get projectM sound data without specifying a device explicitly.</string>
</property>
<property name="text" >
<string>Try first available playback monitor</string>
</property>
</widget>
<widget class="QLabel" name="label" >
<property name="geometry" >
<rect>
<x>20</x>
<x>10</x>
<y>10</y>
<width>251</width>
<height>20</height>
<width>361</width>
<height>251</height>
</rect>
</property>
<property name="text" >
<string>Select a source device below.</string>
</property>
</widget>
<widget class="QListView" name="devicesListView" >
<property name="geometry" >
<rect>
<x>20</x>
<y>30</y>
<width>251</width>
<height>171</height>
</rect>
</property>
<property name="toolTip" >
<string>&lt;html>&lt;head>&lt;meta name="qrichtext" content="1" />&lt;style type="text/css">
<layout class="QHBoxLayout" >
<item>
<layout class="QVBoxLayout" >
<item>
<widget class="QLabel" name="label" >
<property name="text" >
<string>Select a source device below.</string>
</property>
</widget>
</item>
<item>
<widget class="QListView" name="devicesListView" >
<property name="toolTip" >
<string>&lt;html>&lt;head>&lt;meta name="qrichtext" content="1" />&lt;style type="text/css">
p, li { white-space: pre-wrap; }
&lt;/style>&lt;/head>&lt;body style=" font-family:'Sans Serif'; font-size:10pt; font-weight:400; font-style:normal;">
&lt;p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">Double click a source device to activate it.&lt;/p>&lt;/body>&lt;/html></string>
</property>
<property name="autoFillBackground" >
<bool>true</bool>
</property>
<property name="viewMode" >
<enum>QListView::ListMode</enum>
</property>
</property>
<property name="autoFillBackground" >
<bool>true</bool>
</property>
<property name="viewMode" >
<enum>QListView::ListMode</enum>
</property>
</widget>
</item>
<item>
<widget class="QCheckBox" name="tryFirstPlayBackMonitorCheckBox" >
<property name="toolTip" >
<string>This will try to find any available playback monitor on startup as the pulseaudio source device. This is a quick and dirty way to generally get projectM sound data without specifying a device explicitly.</string>
</property>
<property name="text" >
<string>Try first available playback monitor</string>
</property>
</widget>
</item>
</layout>
</item>
<item>
<widget class="QDialogButtonBox" name="buttonBox" >
<property name="orientation" >
<enum>Qt::Vertical</enum>
</property>
<property name="standardButtons" >
<set>QDialogButtonBox::Ok</set>
</property>
</widget>
</item>
</layout>
</widget>
</widget>
<resources>

8
src/projectM-pulseaudio/QPulseAudioDeviceChooser.cpp
View File

@ -1,6 +1,7 @@
#include "QPulseAudioDeviceChooser.hpp"
#include <QSettings>
#include <QtDebug>
#include <QHBoxLayout>
void QPulseAudioDeviceChooser::writeSettings()
{
@ -53,6 +54,13 @@ QPulseAudioDeviceChooser::QPulseAudioDeviceChooser ( QPulseAudioThread * qpulseA
readSettings();
this->devicesListView->setModel ( &_qpulseAudioDeviceModel );
QHBoxLayout * hboxLayout = new QHBoxLayout();
hboxLayout->addWidget(this->layoutWidget);
this->setLayout(hboxLayout);
connect ( tryFirstPlayBackMonitorCheckBox, SIGNAL(stateChanged(int)), this, SLOT(updateDevicesListViewLock(int)));
/// @bug wrong! should be based on HASH index, not display index

13
src/projectM-pulseaudio/projectM-pulseaudio.desktop
View File

@ -1,8 +1,9 @@
[Desktop Entry]
Name=ProjectM-pulseaudio
Comment=ProjectM Pulse Audio gui
Exec=/usr/bin/projectM-pulseaudio
Icon=prjm16-transparent.svg
Encoding=UTF-8
Name=projectM-pulseaudio
Comment=projectM for Pulse Audio
Exec=projectM-pulseaudio
Icon=prjm16-transparent
Terminal=false
Type=Application
Categories=Application;AudioVideo;Audio;
Categories=Application;AudioVideo;Audio;

7
src/projectM-qt/qprojectm_mainwindow.cpp
View File

@ -311,9 +311,9 @@ void QProjectM_MainWindow::openPresetEditorDialog(int rowIndex) {
Q_ASSERT(historyHash.contains(previousFilter));
Q_ASSERT(playlistItemMetaDataHash.contains((*historyHash[previousFilter])[rowIndex]));
QString url = playlistItemMetaDataHash[(*historyHash[previousFilter])[rowIndex]].url;
const QString presetUrl = playlistItemMetaDataHash[(*historyHash[previousFilter])[rowIndex]].url;
m_QPresetEditorDialog->setPreset(url, rowIndex);
m_QPresetEditorDialog->setPreset(presetUrl, rowIndex);
if (m_QPresetEditorDialog->exec()) {
@ -1035,9 +1035,10 @@ void QProjectM_MainWindow::updateFilteredPlaylist ( const QString & text )
}
historyHash.insert ( filter, playlistItems2 );
}
Q_ASSERT(presetExistsWithinFilter == qprojectM()->presetPositionValid());
previousFilter = filter;
previousFilter = filter;
qprojectMWidget()->releasePresetLock();
}