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 @@
0
0
750
- 393
+ 407
@@ -60,90 +60,68 @@
-
-
+
+
-
- &All
+ All
-
- true
+
+ -
+
+ Videos
-
- true
+
+ -
+
+ Images
-
- true
-
-
- filterButtonGroup
-
-
-
-
- &Videos
+ Audio
-
- true
-
-
- true
-
-
- filterButtonGroup
-
-
-
-
- Ima&ges
+ Archives
-
- true
-
-
- true
-
-
- filterButtonGroup
-
+
-
-
+
- A&udio
+ Show &web content
-
+
true
-
- true
-
-
- filterButtonGroup
-
-
-
-
- A&rchives
+
+
+ Qt::Horizontal
-
- true
+
+ QSizePolicy::Expanding
-
- true
+
+
+ 40
+ 20
+
-
- filterButtonGroup
-
-
+
-
+
+
+ 0
+ 0
+
+
25
@@ -216,74 +194,83 @@
-
-
-
-
-
-
- false
+
+
+ Qt::Horizontal
-
- D&eselect All
-
-
+
+
-
false
+
+
+ 0
+ 0
+
+
&Select All
-
-
+
false
+
+
+ 0
+ 0
+
+
- Inver&t Selection
+ D&eselect All
-
-
+
false
+
+
+ 0
+ 0
+
+
- Chec&k Selected
+ Inver&t Selection
-
-
-
- Show &web content
+
+
+ QDialogButtonBox::Cancel
-
- true
-
- -
-
-
- KUrlRequester
- QFrame
-
+ KDialogButtonBox
+ QDialogButtonBox
+
- KPushButton
- QPushButton
-
+ KComboBox
+ QComboBox
+
KLineEdit
@@ -291,36 +278,30 @@
- KComboBox
- QComboBox
-
-
-
KSeparator
QFrame
+
+ KPushButton
+ QPushButton
+
+
+
+ KUrlRequester
+ QFrame
+
+
urlRequester
importLinks
textFilter
filterMode
- showAll
- showVideos
- showImages
- showAudio
- showArchives
deselectAll
- selectAll
invertSelection
- checkSelected
- showWebContent
treeView
-
-
-
--- 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 {