[prev in list] [next in list] [prev in thread] [next in thread]
List: kde-commits
Subject: KDE/kdenetwork/kget/ui
From: Matthias Fuchs <mat69 () gmx ! net>
Date: 2009-11-12 18:51:43
Message-ID: 1258051903.113722.5506.nullmailer () svn ! kde ! org
[Download RAW message or body]
SVN commit 1048104 by mfuchs:
* Removes unnescessary space.
* Hides speed-limit-widgets in the transfersettings if it is not supported, instead \
of deactivating them.
* Removes the speed-limit checkboxes in the transfersettings, use a specialValueText \
instead.
M +1 -1 metalinkcreator/metalinkcreator.cpp
M +1 -2 mirror/mirrorsettings.cpp
M +11 -25 transfersettingsdialog.cpp
M +47 -72 transfersettingsdialog.ui
--- trunk/KDE/kdenetwork/kget/ui/metalinkcreator/metalinkcreator.cpp #1048103:1048104
@@ -319,7 +319,7 @@
uiIntroduction.createButton->toggle();
uiIntroduction.load->setEnabled(false);
uiIntroduction.load->setMode(KFile::File | KFile::LocalOnly | \
KFile::ExistingOnly);
- uiIntroduction.load->setFilter("*.metalink *.meta4 |" + i18n("Metalink file \
(*.metalink *.meta4)")); + uiIntroduction.load->setFilter("*.metalink *.meta4|" + \
i18n("Metalink file (*.metalink *.meta4)"));
connect(uiIntroduction.save, SIGNAL(textChanged(QString)), this, \
SLOT(slotUpdateIntroductionNextButton()));
connect(uiIntroduction.load, SIGNAL(textChanged(QString)), this, \
SLOT(slotUpdateIntroductionNextButton()));
--- trunk/KDE/kdenetwork/kget/ui/mirror/mirrorsettings.cpp #1048103:1048104
@@ -144,8 +144,7 @@
ui.add->setGuiItem(KStandardGuiItem::add());
ui.remove->setGuiItem(KStandardGuiItem::remove());
ui.treeView->setModel(m_model);
- ui.treeView->resizeColumnToContents(MirrorItem::Used);
- ui.treeView->resizeColumnToContents(MirrorItem::Url);
+ ui.treeView->header()->setResizeMode(QHeaderView::ResizeToContents);
ui.treeView->hideColumn(MirrorItem::Preference);
ui.treeView->hideColumn(MirrorItem::Country);
ui.treeView->setItemDelegate(new MirrorDelegate(this));
--- trunk/KDE/kdenetwork/kget/ui/transfersettingsdialog.cpp #1048103:1048104
@@ -36,9 +36,6 @@
ui.downloadSpin->setValue(m_transfer->downloadLimit(Transfer::VisibleSpeedLimit));
ui.uploadSpin->setValue(m_transfer->uploadLimit(Transfer::VisibleSpeedLimit));
ui.ratioSpin->setValue(m_transfer->maximumShareRatio());
- ui.downloadCheck->setChecked(ui.downloadSpin->value() != 0);
- ui.uploadCheck->setChecked(ui.uploadSpin->value() != 0);
- ui.ratioCheck->setChecked(ui.ratioSpin->value() != 0);
ui.kUrlRequester->setUrl(m_transfer->directory().pathOrUrl());
ui.kUrlRequester->lineEdit()->setReadOnly(true);
ui.kUrlRequester->setMode(KFile::Directory | KFile::ExistingOnly);
@@ -55,16 +52,16 @@
m_proxy->setSourceModel(m_model);
ui.treeView->setModel(m_proxy);
ui.treeView->sortByColumn(0, Qt::AscendingOrder);
+ ui.treeView->header()->setResizeMode(QHeaderView::ResizeToContents);
}
- if (!transfer->supportsSpeedLimits())
- {
- ui.downloadCheck->setDisabled(true);
- ui.downloadSpin->setDisabled(true);
- ui.uploadCheck->setDisabled(true);
- ui.uploadSpin->setDisabled(true);
- ui.ratioCheck->setDisabled(true);
- ui.ratioSpin->setDisabled(true);
+ if (!transfer->supportsSpeedLimits()) {
+ ui.labelDownload->hide();
+ ui.downloadSpin->hide();
+ ui.labelUpload->hide();
+ ui.uploadSpin->hide();
+ ui.labelShareRatio->hide();
+ ui.ratioSpin->hide();
}
connect(this, SIGNAL(accepted()), SLOT(save()));
connect(this, SIGNAL(finished()), this, SLOT(slotFinished()));
@@ -139,20 +136,9 @@
KMessageBox::error(this, i18n("Changing the destination did not work, the \
destination stays unmodified."), i18n("Destination unmodified")); }
- if (ui.downloadCheck->isChecked())
- m_transfer->setDownloadLimit(ui.downloadSpin->value(), \
Transfer::VisibleSpeedLimit);
- else
- m_transfer->setDownloadLimit(0, Transfer::VisibleSpeedLimit);
-
- if (ui.uploadCheck->isChecked())
- m_transfer->setUploadLimit(ui.uploadSpin->value(), \
Transfer::VisibleSpeedLimit);
- else
- m_transfer->setUploadLimit(0, Transfer::VisibleSpeedLimit);
-
- if (ui.ratioCheck->isChecked())
- m_transfer->setMaximumShareRatio(ui.ratioSpin->value());
- else
- m_transfer->setMaximumShareRatio(0);
+ m_transfer->setDownloadLimit(ui.downloadSpin->value(), \
Transfer::VisibleSpeedLimit); + m_transfer->setUploadLimit(ui.uploadSpin->value(), \
Transfer::VisibleSpeedLimit); + \
m_transfer->setMaximumShareRatio(ui.ratioSpin->value()); }
void TransferSettingsDialog::slotFinished()
--- trunk/KDE/kdenetwork/kget/ui/transfersettingsdialog.ui #1048103:1048104
@@ -39,66 +39,90 @@
<item row="0" column="1">
<widget class="KUrlRequester" name="kUrlRequester"/>
</item>
- <item row="1" column="0">
- <widget class="QCheckBox" name="uploadCheck">
- <property name="text">
- <string>Upload Limit</string>
- </property>
- </widget>
- </item>
<item row="1" column="1">
<widget class="QSpinBox" name="uploadSpin">
<property name="enabled">
- <bool>false</bool>
+ <bool>true</bool>
</property>
+ <property name="specialValueText">
+ <string extracomment="No value has been set">Not set</string>
+ </property>
<property name="suffix">
<string> KiB</string>
</property>
+ <property name="minimum">
+ <number>0</number>
+ </property>
<property name="maximum">
<number>100000</number>
</property>
- </widget>
- </item>
- <item row="2" column="0">
- <widget class="QCheckBox" name="downloadCheck">
- <property name="text">
- <string>Download Limit</string>
+ <property name="value">
+ <number>0</number>
</property>
</widget>
</item>
<item row="2" column="1">
<widget class="QSpinBox" name="downloadSpin">
<property name="enabled">
- <bool>false</bool>
+ <bool>true</bool>
</property>
+ <property name="specialValueText">
+ <string extracomment="No value has been set">Not set</string>
+ </property>
<property name="suffix">
<string> KiB</string>
</property>
+ <property name="minimum">
+ <number>0</number>
+ </property>
<property name="maximum">
<number>100000</number>
</property>
- </widget>
- </item>
- <item row="3" column="0">
- <widget class="QCheckBox" name="ratioCheck">
- <property name="text">
- <string>Maximum Share Ratio</string>
+ <property name="value">
+ <number>0</number>
</property>
</widget>
</item>
<item row="3" column="1">
<widget class="QDoubleSpinBox" name="ratioSpin">
<property name="enabled">
- <bool>false</bool>
+ <bool>true</bool>
</property>
+ <property name="specialValueText">
+ <string extracomment="No value has been set">Not set</string>
+ </property>
</widget>
</item>
+ <item row="1" column="0">
+ <widget class="QLabel" name="labelUpload">
+ <property name="text">
+ <string>Upload Limit:</string>
+ </property>
+ </widget>
+ </item>
+ <item row="2" column="0">
+ <widget class="QLabel" name="labelDownload">
+ <property name="text">
+ <string>Download Limit:</string>
+ </property>
+ </widget>
+ </item>
+ <item row="3" column="0">
+ <widget class="QLabel" name="labelShareRatio">
+ <property name="text">
+ <string>Maximum Share Ratio:</string>
+ </property>
+ </widget>
+ </item>
</layout>
</item>
<item>
<layout class="QHBoxLayout" name="horizontalLayout">
<item>
<widget class="QTreeView" name="treeView">
+ <property name="uniformRowHeights">
+ <bool>true</bool>
+ </property>
<property name="sortingEnabled">
<bool>true</bool>
</property>
@@ -174,54 +198,5 @@
</customwidget>
</customwidgets>
<resources/>
- <connections>
- <connection>
- <sender>uploadCheck</sender>
- <signal>toggled(bool)</signal>
- <receiver>uploadSpin</receiver>
- <slot>setEnabled(bool)</slot>
- <hints>
- <hint type="sourcelabel">
- <x>97</x>
- <y>60</y>
- </hint>
- <hint type="destinationlabel">
- <x>235</x>
- <y>60</y>
- </hint>
- </hints>
- </connection>
- <connection>
- <sender>downloadCheck</sender>
- <signal>toggled(bool)</signal>
- <receiver>downloadSpin</receiver>
- <slot>setEnabled(bool)</slot>
- <hints>
- <hint type="sourcelabel">
- <x>97</x>
- <y>94</y>
- </hint>
- <hint type="destinationlabel">
- <x>235</x>
- <y>94</y>
- </hint>
- </hints>
- </connection>
- <connection>
- <sender>ratioCheck</sender>
- <signal>toggled(bool)</signal>
- <receiver>ratioSpin</receiver>
- <slot>setEnabled(bool)</slot>
- <hints>
- <hint type="sourcelabel">
- <x>84</x>
- <y>89</y>
- </hint>
- <hint type="destinationlabel">
- <x>203</x>
- <y>90</y>
- </hint>
- </hints>
- </connection>
- </connections>
+ <connections/>
</ui>
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic