projects
/
presencevnc
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
cleanup
[presencevnc]
/
src
/
vncview.cpp
diff --git
a/src/vncview.cpp
b/src/vncview.cpp
index
c0f6f16
..
ccbae25
100644
(file)
--- a/
src/vncview.cpp
+++ b/
src/vncview.cpp
@@
-237,7
+237,8
@@
void VncView::requestPassword()
QHBoxLayout layout1;
QVBoxLayout layout2;
layout2.addWidget(&passwordbox);
QHBoxLayout layout1;
QVBoxLayout layout2;
layout2.addWidget(&passwordbox);
- layout2.addWidget(&save_password);
+ if(!m_host.isEmpty()) //don't save incomming connections
+ layout2.addWidget(&save_password);
layout1.addLayout(&layout2);
layout1.addWidget(&ok_button);
dialog.setLayout(&layout1);
layout1.addLayout(&layout2);
layout1.addWidget(&ok_button);
dialog.setLayout(&layout1);
@@
-245,7
+246,7
@@
void VncView::requestPassword()
if(dialog.exec()) { //dialog accepted
password = passwordbox.text();
if(dialog.exec()) { //dialog accepted
password = passwordbox.text();
- if(save_password.isChecked()) {
+ if(!m_host.isEmpty() and save_password.isChecked()) {
kDebug(5011) << "Saving password for host '" << m_host << "'";
settings.setValue(QString("%1/password").arg(m_host), password);
kDebug(5011) << "Saving password for host '" << m_host << "'";
settings.setValue(QString("%1/password").arg(m_host), password);
@@
-260,8
+261,6
@@
void VncView::requestPassword()
void VncView::outputErrorMessage(const QString &message)
{
void VncView::outputErrorMessage(const QString &message)
{
- kDebug(5011) << message;
-
if (message == "INTERNAL:APPLE_VNC_COMPATIBILTY") {
setCursor(localDotCursor());
m_forceLocalCursor = true;
if (message == "INTERNAL:APPLE_VNC_COMPATIBILTY") {
setCursor(localDotCursor());
m_forceLocalCursor = true;
@@
-817,10
+816,12
@@
void VncView::sendKeySequence(QKeySequence keys)
//to get at individual key presses, we split 'keys' into its components
QList<int> key_list;
//to get at individual key presses, we split 'keys' into its components
QList<int> key_list;
- for(int i = 0; ; i++) {
- QString k = keys.toString().section('+', i, i);
+ int pos = 0;
+ while(true) {
+ QString k = keys.toString().section('+', pos, pos);
if(k.isEmpty())
break;
if(k.isEmpty())
break;
+
//kDebug(5011) << "found key: " << k;
if(k == "Alt") {
key_list.append(Qt::Key_Alt);
//kDebug(5011) << "found key: " << k;
if(k == "Alt") {
key_list.append(Qt::Key_Alt);
@@
-831,6
+832,8
@@
void VncView::sendKeySequence(QKeySequence keys)
} else {
key_list.append(QKeySequence(k)[0]);
}
} else {
key_list.append(QKeySequence(k)[0]);
}
+
+ pos++;
}
for(int i = 0; i < key_list.count(); i++)
}
for(int i = 0; i < key_list.count(); i++)