[prev in list] [next in list] [prev in thread] [next in thread]
List: kde-commits
Subject: extragear/multimedia/amarok/src/dialogs
From: Teo Mrnjavac <teo.mrnjavac () gmail ! com>
Date: 2009-03-20 22:52:47
Message-ID: 1237589567.086147.5114.nullmailer () svn ! kde ! org
[Download RAW message or body]
SVN commit 942072 by mrnjavac:
Added Apply button to PlaylistLayoutEditDialog. Added icons to Ok, Apply and Cancel.
M +22 -5 PlaylistLayoutEditDialog.cpp
M +1 -0 PlaylistLayoutEditDialog.h
M +68 -67 PlaylistLayoutEditDialog.ui
--- trunk/extragear/multimedia/amarok/src/dialogs/PlaylistLayoutEditDialog.cpp \
#942071:942072 @@ -104,6 +104,11 @@
connect( moveUpButton, SIGNAL( clicked() ), this, SLOT( moveUp() ) );
connect( moveDownButton, SIGNAL( clicked() ), this, SLOT( moveDown() ) );
+ buttonBox->button(QDialogButtonBox::Apply)->setIcon( KIcon( "dialog-ok-apply" ) \
); + buttonBox->button(QDialogButtonBox::Ok)->setIcon( KIcon( "dialog-ok" ) );
+ buttonBox->button(QDialogButtonBox::Cancel)->setIcon( KIcon( "dialog-cancel" ) \
); + connect( buttonBox->button(QDialogButtonBox::Apply), SIGNAL( clicked() ), \
this, SLOT( apply() ) ); +
const KIcon newIcon( "list-add" );
newLayoutButton->setIcon( newIcon );
newLayoutButton->setToolTip( i18n( "New playlist layout" ) );
@@ -347,12 +352,10 @@
}
/**
- * Saves the edited layouts from m_layoutMap to the LayoutManager and closes the \
dialog. + * Saves the edited layouts from m_layoutMap to the LayoutManager.
*/
-void PlaylistLayoutEditDialog::accept()
+void PlaylistLayoutEditDialog::apply() //SLOT
{
- DEBUG_BLOCK
-
QMap<QString, PlaylistLayout>::Iterator i = m_layoutsMap->begin();
while( i != m_layoutsMap->end() )
{
@@ -375,13 +378,21 @@
i++;
}
LayoutManager::instance()->setActiveLayout( \
layoutListWidget->currentItem()->text() ); //important to override the previewed \
layout if preview is used +}
+
+/**
+ * Saves the edited layouts from m_layoutMap to the LayoutManager and closes the \
dialog. + */
+void PlaylistLayoutEditDialog::accept() //SLOT
+{
+ apply();
QDialog::accept();
}
/**
* Closes the dialog without saving (almost) any changes.
*/
-void PlaylistLayoutEditDialog::reject()
+void PlaylistLayoutEditDialog::reject() //SLOT
{
DEBUG_BLOCK
@@ -391,6 +402,9 @@
QDialog::reject();
}
+/**
+ * Moves up the currently selected layout.
+ */
void PlaylistLayoutEditDialog::moveUp()
{
int newRow = LayoutManager::instance()->moveUp( m_layoutName );
@@ -401,6 +415,9 @@
layoutListWidget->setCurrentRow( newRow );
}
+/**
+ * Moves down the currently selected layout.
+ */
void PlaylistLayoutEditDialog::moveDown()
{
int newRow = LayoutManager::instance()->moveDown( m_layoutName );
--- trunk/extragear/multimedia/amarok/src/dialogs/PlaylistLayoutEditDialog.h \
#942071:942072 @@ -46,6 +46,7 @@
void preview();
virtual void accept();
virtual void reject();
+ void apply();
void newLayout();
void copyLayout();
void deleteLayout();
--- trunk/extragear/multimedia/amarok/src/dialogs/PlaylistLayoutEditDialog.ui \
#942071:942072 @@ -1,7 +1,8 @@
-<ui version="4.0" >
+<?xml version="1.0" encoding="UTF-8"?>
+<ui version="4.0">
<class>PlaylistLayoutEditDialog</class>
- <widget class="QDialog" name="PlaylistLayoutEditDialog" >
- <property name="geometry" >
+ <widget class="QDialog" name="PlaylistLayoutEditDialog">
+ <property name="geometry">
<rect>
<x>0</x>
<y>0</y>
@@ -9,35 +10,35 @@
<height>351</height>
</rect>
</property>
- <property name="windowTitle" >
+ <property name="windowTitle">
<string>Dialog</string>
</property>
- <layout class="QHBoxLayout" name="horizontalLayout_3" >
+ <layout class="QHBoxLayout" name="horizontalLayout_3">
<item>
- <widget class="QGroupBox" name="groupBox" >
- <property name="sizePolicy" >
- <sizepolicy vsizetype="Expanding" hsizetype="Preferred" >
+ <widget class="QGroupBox" name="groupBox">
+ <property name="sizePolicy">
+ <sizepolicy hsizetype="Preferred" vsizetype="Expanding">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
- <property name="title" >
+ <property name="title">
<string>Available Layouts</string>
</property>
- <layout class="QVBoxLayout" name="verticalLayout_3" >
+ <layout class="QVBoxLayout" name="verticalLayout_3">
<item>
- <layout class="QHBoxLayout" name="listHLayout" >
+ <layout class="QHBoxLayout" name="listHLayout">
<item>
- <widget class="QListWidget" name="layoutListWidget" />
+ <widget class="QListWidget" name="layoutListWidget"/>
</item>
<item>
- <layout class="QVBoxLayout" name="verticalLayout_2" >
+ <layout class="QVBoxLayout" name="verticalLayout_2">
<item>
- <spacer name="verticalSpacer" >
- <property name="orientation" >
+ <spacer name="verticalSpacer">
+ <property name="orientation">
<enum>Qt::Vertical</enum>
</property>
- <property name="sizeHint" stdset="0" >
+ <property name="sizeHint" stdset="0">
<size>
<width>20</width>
<height>40</height>
@@ -46,21 +47,21 @@
</spacer>
</item>
<item>
- <widget class="KArrowButton" name="moveUpButton" />
+ <widget class="KArrowButton" name="moveUpButton"/>
</item>
<item>
- <widget class="KArrowButton" name="moveDownButton" >
- <property name="arrowType" stdset="0" >
+ <widget class="KArrowButton" name="moveDownButton">
+ <property name="arrowType" stdset="0">
<number>2</number>
</property>
</widget>
</item>
<item>
- <spacer name="verticalSpacer_2" >
- <property name="orientation" >
+ <spacer name="verticalSpacer_2">
+ <property name="orientation">
<enum>Qt::Vertical</enum>
</property>
- <property name="sizeHint" stdset="0" >
+ <property name="sizeHint" stdset="0">
<size>
<width>20</width>
<height>40</height>
@@ -73,18 +74,18 @@
</layout>
</item>
<item>
- <layout class="QHBoxLayout" name="horizontalLayout_4" >
+ <layout class="QHBoxLayout" name="horizontalLayout_4">
<item>
- <widget class="KPushButton" name="newLayoutButton" />
+ <widget class="KPushButton" name="newLayoutButton"/>
</item>
<item>
- <widget class="KPushButton" name="copyLayoutButton" />
+ <widget class="KPushButton" name="copyLayoutButton"/>
</item>
<item>
- <widget class="KPushButton" name="deleteLayoutButton" />
+ <widget class="KPushButton" name="deleteLayoutButton"/>
</item>
<item>
- <widget class="KPushButton" name="renameLayoutButton" />
+ <widget class="KPushButton" name="renameLayoutButton"/>
</item>
</layout>
</item>
@@ -92,101 +93,101 @@
</widget>
</item>
<item>
- <layout class="QVBoxLayout" name="verticalLayout" >
+ <layout class="QVBoxLayout" name="verticalLayout">
<item>
- <widget class="TokenPool" name="tokenPool" >
- <property name="sizePolicy" >
- <sizepolicy vsizetype="Preferred" hsizetype="MinimumExpanding" >
+ <widget class="TokenPool" name="tokenPool">
+ <property name="sizePolicy">
+ <sizepolicy hsizetype="MinimumExpanding" vsizetype="Preferred">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
- <property name="minimumSize" >
+ <property name="minimumSize">
<size>
<width>0</width>
<height>0</height>
</size>
</property>
- <property name="maximumSize" >
+ <property name="maximumSize">
<size>
<width>16777215</width>
<height>100</height>
</size>
</property>
- <property name="tabKeyNavigation" >
+ <property name="tabKeyNavigation">
<bool>true</bool>
</property>
- <property name="selectionMode" >
+ <property name="selectionMode">
<enum>QAbstractItemView::SingleSelection</enum>
</property>
- <property name="iconSize" >
+ <property name="iconSize">
<size>
<width>48</width>
<height>48</height>
</size>
</property>
- <property name="textElideMode" >
+ <property name="textElideMode">
<enum>Qt::ElideNone</enum>
</property>
- <property name="movement" >
+ <property name="movement">
<enum>QListView::Static</enum>
</property>
- <property name="isWrapping" stdset="0" >
+ <property name="isWrapping" stdset="0">
<bool>false</bool>
</property>
- <property name="layoutMode" >
+ <property name="layoutMode">
<enum>QListView::Batched</enum>
</property>
- <property name="gridSize" >
+ <property name="gridSize">
<size>
<width>72</width>
<height>64</height>
</size>
</property>
- <property name="viewMode" >
+ <property name="viewMode">
<enum>QListView::IconMode</enum>
</property>
- <property name="modelColumn" >
+ <property name="modelColumn">
<number>0</number>
</property>
- <property name="uniformItemSizes" >
+ <property name="uniformItemSizes">
<bool>false</bool>
</property>
- <property name="wordWrap" >
+ <property name="wordWrap">
<bool>true</bool>
</property>
- <property name="mimeType" stdset="0" >
+ <property name="mimeType" stdset="0">
<string>application/x-amarok-tag-token</string>
</property>
</widget>
</item>
<item>
- <widget class="QTabWidget" name="elementTabs" >
- <property name="currentIndex" >
+ <widget class="QTabWidget" name="elementTabs">
+ <property name="currentIndex">
<number>0</number>
</property>
- <widget class="QWidget" name="tab" >
- <attribute name="title" >
+ <widget class="QWidget" name="tab">
+ <attribute name="title">
<string>Head</string>
</attribute>
</widget>
</widget>
</item>
<item>
- <layout class="QHBoxLayout" name="horizontalLayout_2" >
+ <layout class="QHBoxLayout" name="horizontalLayout_2">
<item>
- <widget class="QPushButton" name="previewButton" >
- <property name="text" >
+ <widget class="QPushButton" name="previewButton">
+ <property name="text">
<string>Preview</string>
</property>
</widget>
</item>
<item>
- <spacer name="horizontalSpacer" >
- <property name="orientation" >
+ <spacer name="horizontalSpacer">
+ <property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
- <property name="sizeHint" stdset="0" >
+ <property name="sizeHint" stdset="0">
<size>
<width>305</width>
<height>21</height>
@@ -195,12 +196,12 @@
</spacer>
</item>
<item>
- <widget class="QDialogButtonBox" name="buttonBox" >
- <property name="orientation" >
+ <widget class="QDialogButtonBox" name="buttonBox">
+ <property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
- <property name="standardButtons" >
- <set>QDialogButtonBox::Cancel|QDialogButtonBox::Ok</set>
+ <property name="standardButtons">
+ <set>QDialogButtonBox::Apply|QDialogButtonBox::Cancel|QDialogButtonBox::Ok</set>
</property>
</widget>
</item>
@@ -213,18 +214,18 @@
<customwidgets>
<customwidget>
<class>KArrowButton</class>
- <extends>QPushButton</extends>
+ <extends></extends>
<header>karrowbutton.h</header>
</customwidget>
<customwidget>
<class>KPushButton</class>
- <extends>QPushButton</extends>
+ <extends></extends>
<header>kpushbutton.h</header>
</customwidget>
<customwidget>
<class>TokenPool</class>
<extends>QListWidget</extends>
- <header location="global" >widgets/TokenPool.h</header>
+ <header location="global">widgets/TokenPool.h</header>
</customwidget>
</customwidgets>
<resources/>
@@ -235,11 +236,11 @@
<receiver>PlaylistLayoutEditDialog</receiver>
<slot>accept()</slot>
<hints>
- <hint type="sourcelabel" >
+ <hint type="sourcelabel">
<x>248</x>
<y>254</y>
</hint>
- <hint type="destinationlabel" >
+ <hint type="destinationlabel">
<x>157</x>
<y>274</y>
</hint>
@@ -251,11 +252,11 @@
<receiver>PlaylistLayoutEditDialog</receiver>
<slot>reject()</slot>
<hints>
- <hint type="sourcelabel" >
+ <hint type="sourcelabel">
<x>316</x>
<y>260</y>
</hint>
- <hint type="destinationlabel" >
+ <hint type="destinationlabel">
<x>286</x>
<y>274</y>
</hint>
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic