*/
#include <QtGui>
-#include "connectdialog.h"
+#ifdef Q_WS_MAEMO_5
+#include <QMaemo5ValueButton>
+#include <QMaemo5ListPickSelector>
+#endif
-#include <iostream>
+#include "connectdialog.h"
+#include "rfb/rfbclient.h"
ConnectDialog::ConnectDialog(QWidget *parent):
setWindowTitle(tr("Connect to VNC Server"));
QSettings settings;
- int i = 0;
- for(;;) { //read history
- QString hostname = settings.value(QString("host%1").arg(i), "").toString();
- if(hostname.isEmpty())
- break;
+ //read history
+ settings.beginGroup("hosts");
+ QStringList hostnames = settings.childGroups();
+ QMap<int, QString> hosts_map; //use position as key
+ foreach(QString hostname, hostnames) {
+ if(!settings.contains(hostname + "/position")) {
+ continue; //can happen when host was given as a command line argument, don't show those
+ }
- hosts.addItem(hostname);
- i++;
+ int position = settings.value(hostname + "/position").toInt();
+ hosts_map.insert(position, hostname);
}
+ hostnames_sorted = hosts_map.values(); //sorted by ascending position
+ settings.endGroup();
+
+ //set up combobox
+ hosts.addItems(hostnames_sorted);
+ hosts.insertSeparator(hosts.count());
+ hosts.addItem(QIcon("/usr/share/icons/hicolor/48x48/hildon/general_received.png"), tr("Listen for Incoming Connections"));
hosts.setEditable(true);
- hosts.lineEdit()->setInputMethodHints(Qt::ImhLowercaseOnly); //doesn't work, but I tried.
+#ifdef Q_WS_MAEMO_5
+ hosts.lineEdit()->setInputMethodHints(Qt::ImhNoAutoUppercase); //somehow this doesn't work that well here
+#endif
connect(&hosts, SIGNAL(editTextChanged(QString)),
- this, SLOT(convertToLowercase(QString)));
+ this, SLOT(hostnameUpdated(QString)));
+ connect(&hosts, SIGNAL(currentIndexChanged(int)),
+ this, SLOT(indexChanged(int)));
layout.addWidget(&hosts);
- QPushButton *done = new QPushButton(tr("Done"));
- done->setMaximumWidth(100);
+#ifdef Q_WS_MAEMO_5
+ QMaemo5ValueButton *quality = new QMaemo5ValueButton(tr("Quality"), this);
+ quality_selector = new QMaemo5ListPickSelector(this);
+ QStandardItemModel *model = new QStandardItemModel(0, 1, this);
+ model->appendRow(new QStandardItem(tr("High\t\t(LAN)"))); //1
+ model->appendRow(new QStandardItem(tr("Medium\t(DSL)"))); //2
+ model->appendRow(new QStandardItem(tr("Low\t\t(ISDN)"))); //3
+ quality_selector->setModel(model);
+ quality->setPickSelector(quality_selector);
+ quality->setValueLayout(QMaemo5ValueButton::ValueUnderText);
+ quality->setMaximumWidth(120);
+ layout.addWidget(quality);
+
+ hostnameUpdated(hosts.lineEdit()->text()); //get saved quality for last host, or 2
+#endif
+
+ done = new QPushButton(tr("Connect"));
+ done->setMaximumWidth(110);
connect(done, SIGNAL(clicked()),
this, SLOT(accept()));
layout.addWidget(done);
setLayout(&layout);
+
+ connect(this, SIGNAL(finished(int)),
+ this, SLOT(deleteLater()));
}
-void ConnectDialog::convertToLowercase(QString newtext)
+void ConnectDialog::indexChanged(int index) {
+ if(index == -1)
+ return;
+
+ //disallow editing for special entries (icon set)
+ const bool normal_entry = hosts.itemIcon(index).isNull();
+ hosts.setEditable(normal_entry);
+
+ done->setText(normal_entry ? tr("Connect") : tr("Listen"));
+}
+
+
+void ConnectDialog::hostnameUpdated(QString newtext)
{
+ //clean up hostname
+ newtext.remove(QChar('/'));
+ newtext.remove(QChar('\\'));
+ int cursorpos = hosts.lineEdit()->cursorPosition();
hosts.lineEdit()->setText(newtext.toLower());
+ hosts.lineEdit()->setCursorPosition(cursorpos);
+
+#ifdef Q_WS_MAEMO_5
+ //saved quality setting available?
+ QSettings settings;
+ int quality = settings.value(QString("hosts/%1/quality").arg(hosts.lineEdit()->text()), 2).toInt();
+ if(quality < 1 or quality > 3)
+ quality = 2;
+ quality_selector->setCurrentIndex(quality-1);
+#endif
}
void ConnectDialog::accept()
{
QDialog::accept();
- if(hosts.currentText().isEmpty()) {
- deleteLater();
+ QString selected_host = hosts.currentText();
+ if(selected_host.isEmpty()) {
return;
}
- //save url?
+#ifdef Q_WS_MAEMO_5
+ int quality = quality_selector->currentIndex() + 1;
+#else
+ int quality = 2;
+#endif
+
QSettings settings;
- bool new_item = hosts.itemText(hosts.currentIndex()) != hosts.currentText();
- bool used_old_host = !new_item and hosts.currentIndex() > 0;
- int rearrange_from_idx;
- if(new_item) {
- std::cout << "adding new item to history\n";
- int i = 0;
- for(;;) { //find first unused key
- QString hostname = settings.value(QString("host%1").arg(i), "").toString();
- if(hostname.isEmpty())
- break;
- i++;
+ if(!hosts.itemIcon(hosts.currentIndex()).isNull()) {
+ int listen_port = settings.value("listen_port", LISTEN_PORT_OFFSET).toInt();
+
+#if QT_VERSION >= 0x040500
+ //ask user if listen_port is correct
+ bool ok;
+ listen_port = QInputDialog::getInt(this,
+ tr("Listen for Incoming Connections"),
+ tr("Listen on Port:"),
+ listen_port, 1, 65535, //value, min, max
+ 1, &ok);
+#else
+ bool ok = true;
+#endif
+ if(ok) {
+ settings.setValue("listen_port", listen_port);
+ emit connectToHost("", quality, listen_port);
}
- rearrange_from_idx = i;
- } else if(used_old_host) {
- rearrange_from_idx = hosts.currentIndex();
+ return;
}
+ settings.beginGroup("hosts");
+ bool new_item = !hostnames_sorted.contains(selected_host);
+ bool used_old_host = !new_item and hosts.currentIndex() > 0;
+ //if both are false, we don't need to mess with positions
+
if(new_item or used_old_host) {
- std::cout << "rearranging history, last index " << rearrange_from_idx << "\n";
+ //put selected_host at the top
+ settings.setValue(QString("%1/position").arg(selected_host), 0);
- for(int i = rearrange_from_idx-1; i >= 0; i--) { //increment index for each entry newer than the selected one
- QString hostname = settings.value(QString("host%1").arg(i), "").toString();
- settings.setValue(QString("host%1").arg(i+1), hostname);
- }
- settings.setValue(QString("host0"), hosts.currentText());
+ //don't create duplicates
+ if(used_old_host)
+ hostnames_sorted.removeAll(selected_host);
+
+ //now rebuild list for positions >= 1
+ for(int i = 0; i < hostnames_sorted.size(); i++)
+ settings.setValue(QString("%1/position").arg(hostnames_sorted.at(i)), i+1);
}
- emit connectToHost(QString("vnc://") + hosts.currentText());
- deleteLater();
+#ifdef Q_WS_MAEMO_5
+ settings.setValue(QString("%1/quality").arg(selected_host), quality);
+#endif
+
+ settings.endGroup();
+ settings.sync();
+
+ emit connectToHost(QString("vnc://%1").arg(selected_host), quality, 0);
}
projects / presencevnc / blobdiff