summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLubos Dolezel <lubos@dolezel.info>2015-06-03 11:40:15 +0200
committerLubos Dolezel <lubos@dolezel.info>2015-06-03 11:40:15 +0200
commit7109d3c44c6cbead9a58253b118bb94905411b28 (patch)
tree2edfe39f831e77b7684bba99063b18d840a0b629
parent81a256d9a4f032f349c2fea52b794dec48150920 (diff)
downloadtwinkle-7109d3c44c6cbead9a58253b118bb94905411b28.tar
twinkle-7109d3c44c6cbead9a58253b118bb94905411b28.tar.gz
twinkle-7109d3c44c6cbead9a58253b118bb94905411b28.tar.lz
twinkle-7109d3c44c6cbead9a58253b118bb94905411b28.tar.xz
twinkle-7109d3c44c6cbead9a58253b118bb94905411b28.zip
selectnicform ported to Qt4
-rw-r--r--TODO1
-rw-r--r--src/gui/gui.cpp7
-rw-r--r--src/gui/selectnicform.ui2
3 files changed, 4 insertions, 6 deletions
diff --git a/TODO b/TODO
index da01d58..0ab5919 100644
--- a/TODO
+++ b/TODO
@@ -7,7 +7,6 @@
Remaining .ui/cpp/h files:
* mphoneform
- * selectnicform
* selectprofileform
* selectuserform
* syssettingsform
diff --git a/src/gui/gui.cpp b/src/gui/gui.cpp
index 4f90132..1b0fbbb 100644
--- a/src/gui/gui.cpp
+++ b/src/gui/gui.cpp
@@ -889,15 +889,14 @@ string t_gui::select_network_intf(void) {
for (list<t_interface>::iterator i = l->begin(); i != l->end(); i++) {
item = i->name.c_str();
item.append(':').append(i->get_ip_addr().c_str());
- sf->nicListBox->insertItem(
- QPixmap(":/icons/images/kcmpci16.png"),
- item);
+
+ new QListWidgetItem(QPixmap(":/icons/images/kcmpci16.png"), item, sf->nicListBox);
}
sf->nicListBox->setCurrentItem(0);
sf->exec();
- int selection = sf->nicListBox->currentItem();
+ int selection = sf->nicListBox->currentRow();
int num = 0;
for (list<t_interface>::iterator i = l->begin(); i != l->end(); i++) {
if (num == selection) {
diff --git a/src/gui/selectnicform.ui b/src/gui/selectnicform.ui
index 4da5e07..77d78e1 100644
--- a/src/gui/selectnicform.ui
+++ b/src/gui/selectnicform.ui
@@ -62,7 +62,7 @@
</widget>
</item>
<item>
- <widget class="Q3ListBox" name="nicListBox">
+ <widget class="QListWidget" name="nicListBox">
<property name="whatsThis" stdset="0">
<string>You have multiple IP addresses. Here you must select which IP address should be used. This IP address will be used inside the SIP messages.</string>
</property>