mirror/projectm
3
0
Fork 0
mirror of https://github.com/projectM-visualizer/projectm.git synced 2026-04-26 08:24:45 +00:00
Code Issues Projects Releases Wiki Activity

added open playlist button on playlist dialog.

Browse Source 
git-svn-id: https://projectm.svn.sourceforge.net/svnroot/projectm/trunk@1291 6778bc44-b910-0410-a7a0-be141de4315d
This commit is contained in:
w1z7ard
2009-10-04 14:44:41 +00:00
parent f3d9e1a354
commit 6b2962138d
2 changed files with 48 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -103,7 +103,7 @@ activePresetIndex(new Nullable<long>), playlistItemCounter(0), m_QPresetEditorDi
connect ( m_QProjectMWidget, SIGNAL ( projectM_Initialized(QProjectM*) ),
this, SLOT ( postProjectM_Initialize() ) );
connect(this, SIGNAL(dockLocationChanged ( Qt::DockWidgetArea)), SLOT(dockLocationChanged(Qt::DockWidgetArea)));
//connect(this, SIGNAL(dockLocationChanged ( Qt::DockWidgetArea)), SLOT(dockLocationChanged(Qt::DockWidgetArea)));
m_QProjectMWidget->makeCurrent();
m_QProjectMWidget->setFocus();
setCentralWidget ( m_QProjectMWidget );

54
src/projectM-qt/qprojectm_mainwindow.ui
View File

@ -75,7 +75,7 @@
<property name="minimumSize">
<size>
<width>315</width>
<height>110</height>
<height>111</height>
</size>
</property>
<property name="baseSize">
@ -130,7 +130,7 @@ p, li { white-space: pre-wrap; }
</property>
</widget>
</item>
<item row="0" column="2">
<item row="0" column="3">
<widget class="QPushButton" name="presetSavePushButton">
<property name="sizePolicy">
<sizepolicy hsizetype="Expanding" vsizetype="Fixed">
@ -156,7 +156,7 @@ p, li { white-space: pre-wrap; }
</property>
</widget>
</item>
<item row="0" column="3">
<item row="0" column="4">
<widget class="QPushButton" name="clearPresetList_PushButton">
<property name="sizePolicy">
<sizepolicy hsizetype="MinimumExpanding" vsizetype="Fixed">
@ -179,11 +179,11 @@ p, li { white-space: pre-wrap; }
</property>
</widget>
</item>
<item row="0" column="4">
<item row="0" column="5">
<widget class="QLineEdit" name="presetSearchBarLineEdit">
<property name="sizePolicy">
<sizepolicy hsizetype="Expanding" vsizetype="Fixed">
<horstretch>20</horstretch>
<horstretch>30</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
@ -198,7 +198,7 @@ p, li { white-space: pre-wrap; }
</property>
</widget>
</item>
<item row="1" column="0" colspan="5">
<item row="1" column="0" colspan="6">
<widget class="QPlaylistTableView" name="tableView">
<property name="sizePolicy">
<sizepolicy hsizetype="Expanding" vsizetype="Expanding">
@ -314,7 +314,7 @@ image: url(:/images/icons/hi16-action-projectm_random_no.png);
</property>
</widget>
</item>
<item row="2" column="1" colspan="4">
<item row="2" column="1" colspan="5">
<widget class="QCheckBox" name="lockPresetCheckBox">
<property name="enabled">
<bool>true</bool>
@ -359,6 +359,30 @@ image: url(:/images/icons/hi16-action-projectm_unlock.png);
</property>
</widget>
</item>
<item row="0" column="2">
<widget class="QPushButton" name="loadPlaylistPushButton">
<property name="sizePolicy">
<sizepolicy hsizetype="MinimumExpanding" vsizetype="Fixed">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="toolTip">
<string>&lt;!DOCTYPE HTML PUBLIC &quot;-//W3C//DTD HTML 4.0//EN&quot; &quot;http://www.w3.org/TR/REC-html40/strict.dtd&quot;&gt;
&lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
p, li { white-space: pre-wrap; }
&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:'Sans'; font-size:10pt; font-weight:400; font-style:normal;&quot;&gt;
&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-family:'Sans Serif'; font-size:9pt;&quot;&gt;Open the file browser to load a playlist.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
</property>
<property name="text">
<string/>
</property>
<property name="icon">
<iconset resource="application.qrc">
<normaloff>:/images/icons/hi16-action-projectm_edit.png</normaloff>:/images/icons/hi16-action-projectm_edit.png</iconset>
</property>
</widget>
</item>
</layout>
</widget>
</widget>
@ -511,5 +535,21 @@ image: url(:/images/icons/hi16-action-projectm_unlock.png);
</hint>
</hints>
</connection>
<connection>
<sender>loadPlaylistPushButton</sender>
<signal>clicked()</signal>
<receiver>actionOpen_Play_List</receiver>
<slot>trigger()</slot>
<hints>
<hint type="sourcelabel">
<x>83</x>
<y>76</y>
</hint>
<hint type="destinationlabel">
<x>-1</x>
<y>-1</y>
</hint>
</hints>
</connection>
</connections>
</ui>