[prev in list] [next in list] [prev in thread] [next in thread]
List: kde-commits
Subject: KDE/kdenetwork/kget
From: Lukas Appelhans <l.appelhans () gmx ! de>
Date: 2011-08-12 11:43:24
Message-ID: 20110812114325.03E4EAC7CB () svn ! kde ! org
[Download RAW message or body]
SVN commit 1246657 by lappelhans:
import link dialog ui revamp
M +2 -2 mainwindow.cpp
M +81 -100 ui/linkview/importlinkdialog.ui
M +18 -25 ui/linkview/kget_linkview.cpp
M +4 -4 ui/linkview/kget_sortfilterproxymodel.h
--- trunk/KDE/kdenetwork/kget/mainwindow.cpp #1246656:1246657
@@ -285,16 +285,16 @@
actionCollection());
actionCollection()->addAction("start_menu", startActionMenu);
startActionMenu->setDelayed(true);
+ startActionMenu->addAction(startSelectedAction);
startActionMenu->addAction(startAllAction);
- startActionMenu->addAction(startSelectedAction);
connect(startActionMenu, SIGNAL(triggered()), SLOT(slotStartDownload()));
KActionMenu *stopActionMenu = new KActionMenu(KIcon("media-playback-pause"), \
i18n("Pause"), actionCollection());
actionCollection()->addAction("stop_menu", stopActionMenu);
stopActionMenu->setDelayed(true);
+ stopActionMenu->addAction(stopSelectedAction);
stopActionMenu->addAction(stopAllAction);
- stopActionMenu->addAction(stopSelectedAction);
connect(stopActionMenu, SIGNAL(triggered()), SLOT(slotStopDownload()));
KAction *openDestAction = actionCollection()->addAction("transfer_open_dest");
--- trunk/KDE/kdenetwork/kget/ui/linkview/importlinkdialog.ui #1246656:1246657
@@ -7,7 +7,7 @@
<x>0</x>
<y>0</y>
<width>750</width>
- <height>393</height>
+ <height>407</height>
</rect>
</property>
<layout class="QVBoxLayout" name="verticalLayout">
@@ -60,90 +60,68 @@
</widget>
</item>
<item>
- <widget class="KPushButton" name="showAll">
+ <widget class="QComboBox" name="showCombo">
+ <item>
<property name="text">
- <string comment="filter: show all file types">&All</string>
+ <string>All</string>
</property>
- <property name="checkable">
- <bool>true</bool>
+ </item>
+ <item>
+ <property name="text">
+ <string>Videos</string>
</property>
- <property name="checked">
- <bool>true</bool>
+ </item>
+ <item>
+ <property name="text">
+ <string>Images</string>
</property>
- <property name="autoExclusive">
- <bool>true</bool>
- </property>
- <attribute name="buttonGroup">
- <string>filterButtonGroup</string>
- </attribute>
- </widget>
</item>
<item>
- <widget class="KPushButton" name="showVideos">
<property name="text">
- <string>&Videos</string>
+ <string>Audio</string>
</property>
- <property name="checkable">
- <bool>true</bool>
- </property>
- <property name="autoExclusive">
- <bool>true</bool>
- </property>
- <attribute name="buttonGroup">
- <string>filterButtonGroup</string>
- </attribute>
- </widget>
</item>
<item>
- <widget class="KPushButton" name="showImages">
<property name="text">
- <string>Ima&ges</string>
+ <string>Archives</string>
</property>
- <property name="checkable">
- <bool>true</bool>
- </property>
- <property name="autoExclusive">
- <bool>true</bool>
- </property>
- <attribute name="buttonGroup">
- <string>filterButtonGroup</string>
- </attribute>
+ </item>
</widget>
</item>
<item>
- <widget class="KPushButton" name="showAudio">
+ <widget class="QCheckBox" name="showWebContent">
<property name="text">
- <string>A&udio</string>
+ <string>Show &web content</string>
</property>
- <property name="checkable">
+ <property name="checked">
<bool>true</bool>
</property>
- <property name="autoExclusive">
- <bool>true</bool>
- </property>
- <attribute name="buttonGroup">
- <string>filterButtonGroup</string>
- </attribute>
</widget>
</item>
<item>
- <widget class="KPushButton" name="showArchives">
- <property name="text">
- <string>A&rchives</string>
+ <spacer name="horizontalSpacer">
+ <property name="orientation">
+ <enum>Qt::Horizontal</enum>
</property>
- <property name="checkable">
- <bool>true</bool>
+ <property name="sizeType">
+ <enum>QSizePolicy::Expanding</enum>
</property>
- <property name="autoExclusive">
- <bool>true</bool>
+ <property name="sizeHint" stdset="0">
+ <size>
+ <width>40</width>
+ <height>20</height>
+ </size>
</property>
- <attribute name="buttonGroup">
- <string>filterButtonGroup</string>
- </attribute>
- </widget>
+ </spacer>
</item>
<item>
<widget class="KLineEdit" name="textFilter">
+ <property name="sizePolicy">
+ <sizepolicy hsizetype="MinimumExpanding" vsizetype="Fixed">
+ <horstretch>0</horstretch>
+ <verstretch>0</verstretch>
+ </sizepolicy>
+ </property>
<property name="minimumSize">
<size>
<width>25</width>
@@ -216,74 +194,83 @@
</widget>
</item>
<item>
- <layout class="QHBoxLayout" name="horizontalLayout">
- <item>
- <widget class="KPushButton" name="deselectAll">
- <property name="enabled">
- <bool>false</bool>
+ <widget class="Line" name="line">
+ <property name="orientation">
+ <enum>Qt::Horizontal</enum>
</property>
- <property name="text">
- <string>D&eselect All</string>
- </property>
</widget>
</item>
<item>
+ <layout class="QHBoxLayout" name="horizontalLayout">
+ <item>
<widget class="KPushButton" name="selectAll">
<property name="enabled">
<bool>false</bool>
</property>
+ <property name="sizePolicy">
+ <sizepolicy hsizetype="Minimum" vsizetype="Minimum">
+ <horstretch>0</horstretch>
+ <verstretch>0</verstretch>
+ </sizepolicy>
+ </property>
<property name="text">
<string>&Select All</string>
</property>
</widget>
</item>
<item>
- <widget class="KPushButton" name="invertSelection">
+ <widget class="KPushButton" name="deselectAll">
<property name="enabled">
<bool>false</bool>
</property>
+ <property name="sizePolicy">
+ <sizepolicy hsizetype="Minimum" vsizetype="Minimum">
+ <horstretch>0</horstretch>
+ <verstretch>0</verstretch>
+ </sizepolicy>
+ </property>
<property name="text">
- <string>Inver&t Selection</string>
+ <string>D&eselect All</string>
</property>
</widget>
</item>
<item>
- <widget class="KPushButton" name="checkSelected">
+ <widget class="KPushButton" name="invertSelection">
<property name="enabled">
<bool>false</bool>
</property>
+ <property name="sizePolicy">
+ <sizepolicy hsizetype="Minimum" vsizetype="Minimum">
+ <horstretch>0</horstretch>
+ <verstretch>0</verstretch>
+ </sizepolicy>
+ </property>
<property name="text">
- <string comment="Check as in mark, not as in verify">Chec&k \
Selected</string> + <string>Inver&t Selection</string>
</property>
</widget>
</item>
<item>
- <widget class="QCheckBox" name="showWebContent">
- <property name="text">
- <string>Show &web content</string>
+ <widget class="KDialogButtonBox" name="dialogButtonBox">
+ <property name="standardButtons">
+ <set>QDialogButtonBox::Cancel</set>
</property>
- <property name="checked">
- <bool>true</bool>
- </property>
</widget>
</item>
</layout>
</item>
- <item>
- <widget class="KSeparator" name="kseparator"/>
- </item>
</layout>
</widget>
<customwidgets>
<customwidget>
- <class>KUrlRequester</class>
- <extends>QFrame</extends>
- <header>kurlrequester.h</header>
+ <class>KDialogButtonBox</class>
+ <extends>QDialogButtonBox</extends>
+ <header>kdialogbuttonbox.h</header>
</customwidget>
<customwidget>
- <class>KPushButton</class>
- <extends>QPushButton</extends>
- <header>kpushbutton.h</header>
+ <class>KComboBox</class>
+ <extends>QComboBox</extends>
+ <header>kcombobox.h</header>
</customwidget>
<customwidget>
<class>KLineEdit</class>
@@ -291,36 +278,30 @@
<header>klineedit.h</header>
</customwidget>
<customwidget>
- <class>KComboBox</class>
- <extends>QComboBox</extends>
- <header>kcombobox.h</header>
- </customwidget>
- <customwidget>
<class>KSeparator</class>
<extends>QFrame</extends>
<header>kseparator.h</header>
</customwidget>
+ <customwidget>
+ <class>KPushButton</class>
+ <extends>QPushButton</extends>
+ <header>kpushbutton.h</header>
+ </customwidget>
+ <customwidget>
+ <class>KUrlRequester</class>
+ <extends>QFrame</extends>
+ <header>kurlrequester.h</header>
+ </customwidget>
</customwidgets>
<tabstops>
<tabstop>urlRequester</tabstop>
<tabstop>importLinks</tabstop>
<tabstop>textFilter</tabstop>
<tabstop>filterMode</tabstop>
- <tabstop>showAll</tabstop>
- <tabstop>showVideos</tabstop>
- <tabstop>showImages</tabstop>
- <tabstop>showAudio</tabstop>
- <tabstop>showArchives</tabstop>
<tabstop>deselectAll</tabstop>
- <tabstop>selectAll</tabstop>
<tabstop>invertSelection</tabstop>
- <tabstop>checkSelected</tabstop>
- <tabstop>showWebContent</tabstop>
<tabstop>treeView</tabstop>
</tabstops>
<resources/>
<connections/>
- <buttongroups>
- <buttongroup name="filterButtonGroup"/>
- </buttongroups>
</ui>
--- trunk/KDE/kdenetwork/kget/ui/linkview/kget_linkview.cpp #1246656:1246657
@@ -37,6 +37,7 @@
{
setAttribute(Qt::WA_DeleteOnClose);
setCaption(i18n("Import Links"));
+ setButtons(0);
if (parent) {
KWindowInfo info = KWindowSystem::windowInfo(parent->winId(), \
NET::WMDesktop, NET::WMDesktop); @@ -56,19 +57,12 @@
// set the Icons
ui.importLinks->setIcon(KIcon("document-import"));
- ui.showAll->setIcon(KIcon("view-list-icons"));
- ui.showArchives->setIcon(KIcon("package-x-generic"));
- ui.showAudio->setIcon(KIcon("audio-x-generic"));
- ui.showImages->setIcon(KIcon("image-x-generic"));
- ui.showVideos->setIcon(KIcon("video-x-generic"));
+ ui.showCombo->setItemIcon(0, KIcon("view-list-icons"));
+ ui.showCombo->setItemIcon(4, KIcon("package-x-generic"));
+ ui.showCombo->setItemIcon(3, KIcon("audio-x-generic"));
+ ui.showCombo->setItemIcon(2, KIcon("image-x-generic"));
+ ui.showCombo->setItemIcon(1, KIcon("video-x-generic"));
- // set the ids for the filterButtonGroup
- ui.filterButtonGroup->setId(ui.showAll, KGetSortFilterProxyModel::NoFilter);
- ui.filterButtonGroup->setId(ui.showArchives, \
KGetSortFilterProxyModel::CompressedFiles);
- ui.filterButtonGroup->setId(ui.showAudio, KGetSortFilterProxyModel::AudioFiles);
- ui.filterButtonGroup->setId(ui.showImages, \
KGetSortFilterProxyModel::ImageFiles);
- ui.filterButtonGroup->setId(ui.showVideos, \
KGetSortFilterProxyModel::VideoFiles);
-
ui.treeView->setModel(m_proxyModel);
ui.progressBar->hide();
@@ -91,22 +85,26 @@
connect(ui.textFilter, SIGNAL(textChanged(QString)), \
SLOT(setTextFilter(QString)));
connect(ui.textFilter, SIGNAL(aboutToShowContextMenu(QMenu*)), this, \
SLOT(contextMenuDisplayed(QMenu*)));
connect(ui.filterMode, SIGNAL(currentIndexChanged(int)), m_proxyModel, \
SLOT(setFilterMode(int)));
- connect(ui.filterButtonGroup, SIGNAL(buttonClicked(int)), m_proxyModel, \
SLOT(setFilterType(int)));
- connect(ui.filterButtonGroup, SIGNAL(buttonClicked(int)), \
SLOT(updateSelectionButtons())); + connect(ui.showCombo, \
SIGNAL(currentIndexChanged(int)), m_proxyModel, SLOT(setFilterType(int))); + \
connect(ui.showCombo, SIGNAL(currentIndexChanged(int)), \
SLOT(updateSelectionButtons()));
connect(ui.urlRequester, SIGNAL(textChanged(QString)), \
SLOT(updateImportButtonStatus(QString))); + connect(ui.urlRequester, \
SIGNAL(urlSelected(KUrl)), SLOT(slotStartImport())); connect(ui.selectAll, \
SIGNAL(clicked()), this, SLOT(checkAll())); connect(ui.deselectAll, \
SIGNAL(clicked()), this, SLOT(uncheckAll()));
- connect(ui.checkSelected, SIGNAL(clicked()), this, SLOT(slotCheckSelected()));
connect(ui.invertSelection, SIGNAL(clicked()), this, \
SLOT(slotInvertSelection()));
- connect(this, SIGNAL(okClicked()), this, SLOT(slotStartLeech()));
+ connect(this, SIGNAL(accepted()), this, SLOT(slotStartLeech()));
connect(ui.showWebContent, SIGNAL(stateChanged(int)), m_proxyModel, \
SLOT(setShowWebContent(int)));
connect(ui.importLinks, SIGNAL(clicked()), this, SLOT(slotStartImport()));
connect(ui.treeView->selectionModel(), \
SIGNAL(selectionChanged(QItemSelection,QItemSelection)), SLOT(selectionChanged()));
+ connect(ui.dialogButtonBox, SIGNAL(rejected()), SLOT(reject()));
setMainWidget(widget);
- setButtonText(KDialog::Ok, i18nc("Download the items which have been \
selected","&Download Checked"));
- setButtonIcon(KDialog::Ok, KIcon("kget"));
+ QPushButton *download = ui.dialogButtonBox->addButton(i18nc("Download the items \
which have been selected","&Download"), + \
QDialogButtonBox::AcceptRole, + \
this, + SLOT(accept()));
+ download->setIcon(KIcon("kget"));
checkClipboard();
}
@@ -186,6 +184,7 @@
QStandardItem *item = new QStandardItem(file);
item->setIcon(KIcon(mimeTypeIcon));
item->setCheckable(true);
+ item->setCheckState(Qt::Checked);
item->setData(QVariant(url.fileName()), Qt::DisplayRole);
item->setData(QVariant(mimeTypeName), Qt::UserRole); // used for filtering \
DownloadFilterType
@@ -227,13 +226,8 @@
}
NewTransferDialogHandler::showNewTransferDialog(urls);
- accept(); // close the dialog
}
- else
- {
- reject();
}
-}
void KGetLinkView::setPageUrl( const QString& url )
{
@@ -287,7 +281,6 @@
ui.selectAll->setEnabled( !(!modelRowCount || count == \
m_proxyModel->rowCount() ) ); ui.deselectAll->setEnabled( count > 0 );
ui.invertSelection->setEnabled( count > 0 );
- ui.checkSelected->setEnabled(ui.treeView->selectionModel()->selectedIndexes().size() \
> 0);
enableButtonOk(buttonEnabled);
}
@@ -309,7 +302,7 @@
void KGetLinkView::updateSelectionButtons()
{
- const bool isFiltered = !ui.textFilter->text().isEmpty() || \
(ui.filterButtonGroup->checkedId() != KGetSortFilterProxyModel::NoFilter); + const \
bool isFiltered = !ui.textFilter->text().isEmpty() || (ui.showCombo->currentIndex() \
!= KGetSortFilterProxyModel::NoFilter);
ui.selectAll->setText(isFiltered ? i18n("&Select All Filtered") : i18n("&Select \
All"));
ui.deselectAll->setText(isFiltered ? i18n("D&eselect All Filtered") : \
i18n("D&eselect All"));
--- trunk/KDE/kdenetwork/kget/ui/linkview/kget_sortfilterproxymodel.h \
#1246656:1246657 @@ -30,12 +30,12 @@
KGetSortFilterProxyModel(QObject *parent = 0);
virtual ~KGetSortFilterProxyModel();
- enum DownloadFilterType {
+ enum DownloadFilterType { //Keep the numbers, they are necessary for the \
filtering to work NoFilter = 0,
VideoFiles = 1,
- AudioFiles = 2,
- CompressedFiles = 3,
- ImageFiles = 4
+ AudioFiles = 3,
+ CompressedFiles = 4,
+ ImageFiles = 2
};
enum FilterMode {
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic