Changeset 4838

Timestamp:

01/27/07 18:23:17 (23 months ago)

Author:

flynd

Message:

Merged revisions 4797-4799,4801-4833,4835-4837 via svnmerge from
svn+ssh://licq/trunk/qt-gui

........

r4797 | erijo | 2006-12-13 18:40:55 +0100 (Wed, 13 Dec 2006) | 1 line

Goto end of history when opening a new send dialog

........

r4798 | erijo | 2006-12-13 19:17:19 +0100 (Wed, 13 Dec 2006) | 4 lines

Return focus to text edit after canceling a send.

Fixes #1466.

........

r4804 | erijo | 2007-01-04 22:18:44 +0100 (Thu, 04 Jan 2007) | 4 lines

Auto popup message if client status is away or na (in addition to online and ffc).

Closes #1416.

........

r4805 | erijo | 2007-01-05 14:18:07 +0100 (Fri, 05 Jan 2007) | 4 lines

Revert r4804 since it caused problems. The fix should either be an option or something completely different has to be implemented.

Reopens #1416.

........

r4816 | erijo | 2007-01-09 23:25:03 +0100 (Tue, 09 Jan 2007) | 6 lines

Don't include . , : ; ? ! or <space> in the url if one of them appear at
the end. This way, in e.g. this message:
"Check out http://trac.licq.org/timeline!"
the link will become "http://trac.licq.org/timeline" instead of
"http://trac.licq.org/timeline!".

........

r4837 | flynd | 2007-01-27 09:56:03 +0100 (Sat, 27 Jan 2007) | 4 lines

Created a spinbox for editing timezones and changed the user info dialog to allow timezone of contacts to be changed.
This implements one part of the feature in #1.
Changing the owners timezone is disabled as licq uses system setting instead.

........

Location:

branches/qt-gui_qt4

Files:

• . (modified) (1 prop)
• src/ewidgets.cpp (modified) (3 diffs)
• src/ewidgets.h (modified) (2 diffs)
• src/mlview.cpp (modified) (1 diff)
• src/usereventdlg.cpp (modified) (2 diffs)
• src/userinfodlg.cpp (modified) (3 diffs)
• src/userinfodlg.h (modified) (1 diff)

branches/qt-gui_qt4/src/ewidgets.cpp

@@ -57 +57 @@
 #include "licq_history.h"
 #include "licq_events.h"
+#include "licq_user.h"
 #include "mainwin.h"
 #include "eventdesc.h"
@@ -466 +467 @@
 }
 
+// -----------------------------------------------------------------------------
+
+CTimeZoneField::CTimeZoneField(QWidget *parent)
+    : QSpinBox(-24, 24, 1, parent)
+{
+  // The world is round so let timezones wrap
+  setWrapping(true);
+
+  // Plus and minus seems more fitting than up and down
+  setButtonSymbols(QSpinBox::PlusMinus);
+
+  // Force the input to be in format GMT+500, GMT-1030, etc...
+  setPrefix("GMT");
+  setValidator(new QRegExpValidator(QRegExp("^[\\+\\-](1[012]|\\d)[03]0$|^Unknown$"), this));
+
+  // Allow the value to be undefined as well. This will replace the lowest value (-24)
+  setSpecialValueText(tr("Unknown"));
+}
+
+void CTimeZoneField::setData(char data)
+{
+  // The spinbox uses the lowest value to mark the undefined state but the constant is some other value so we need to change it
+  // For all defined values, the sign is inverted
+  setValue(data == TIMEZONE_UNKNOWN ? undefinedValue : static_cast<int>(-data));
+}
+
+char CTimeZoneField::data()
+{
+  int v = value();
+  if (v == undefinedValue)
+    return TIMEZONE_UNKNOWN;
+  return static_cast<char>(-v);
+}
+
+QString CTimeZoneField::mapValueToText(int v)
+{
+  // The internal value in the spinbox is 30min intervals so convert it to something more readable
+  return QString("%1%2%3").arg(v < 0 ? "-" : "+").arg(abs(v) / 2).arg(v % 2 ? "30" : "00");
+}
+
+int CTimeZoneField::mapTextToValue(bool *ok)
+{
+  // The user entered something so now we must try and convert it back to the internal int
+  QRegExp rx("^(\\+|-)(\\d+)(0|3)0$");
+  if (rx.search(cleanText()) == -1)
+  {
+    *ok = false;
+    return 0;
+  }
+  int ret = rx.cap(2).toInt() * 2;
+  if (rx.cap(3) == "3")
+    ret++;
+  if (rx.cap(1) == "-")
+    ret = -ret;
+  *ok = true;
+  return ret;
+}
 
 // -----------------------------------------------------------------------------
@@ -473 +531 @@
 {
   setTextFormat(Qt::RichText);
-};
+}
 
 // -----------------------------------------------------------------------------

branches/qt-gui_qt4/src/ewidgets.h

@@ -40 +40 @@
 #include <QtCore/QEvent>
 #include <QtCore/QStringList>
+#include <qspinbox.h>
 
 #include "mlview.h"
@@ -146 +147 @@
 };
 
+/* ----------------------------------------------------------------------------- */
+
+/**
+ * Input field for timezones.
+ */
+class CTimeZoneField : public QSpinBox
+{
+public:
+  CTimeZoneField(QWidget *parent);
+  void setData(char data);
+  char data();
+protected:
+  QString mapValueToText(int v);
+  int mapTextToValue(bool* ok);
+
+  static const int undefinedValue = -24;
+};
 
 /* ----------------------------------------------------------------------------- */

branches/qt-gui_qt4/src/mlview.cpp

@@ -86 +86 @@
       "[a-z0-9.-]+\\.([a-z]+|[0-9]+)"               // hostname.tld or ip address
       "(:[0-9]+)?"                                  // optional port
-      "(/([-\\w%{}|\\\\^~`;/?:@=&$_.+!*'(),#]|\\[|\\])*)?");
+      "(/(([-\\w%{}|\\\\^~`;/?:@=&$_.+!*'(),#]|\\[|\\])*[^.,:;?!\\s])*)?");
     reURL.setMinimal(false);
     reURL.setCaseSensitive(false);

branches/qt-gui_qt4/src/usereventdlg.cpp

@@ -1646 +1646 @@
         if (tmp != "")
           mleHistory->append(tmp);
+
+        mleHistory->GotoEnd();
       }
     }
@@ -2355 +2357 @@
     disconnect (sigman, SIGNAL(signal_doneUserFcn(ICQEvent *)), this, SLOT(sendDone_common(ICQEvent *)));
 
+  if (mleSend != NULL)
+    mleSend->setFocus();
+
   if (e->Result() != EVENT_ACKED)
   {

branches/qt-gui_qt4/src/userinfodlg.cpp

@@ -315 +315 @@
   lay->addWidget(nfoStatus, CR, 1);
   lay->addWidget(new QLabel(tr("Timezone:"), p), CR, 3);
-  nfoTime = new CInfoField(p, true);
-  lay->addWidget(nfoTime, CR, 4);
+  tznZone = new CTimeZoneField(p);
+  lay->addWidget(tznZone, CR, 4);
 
   lay->addWidget(new QLabel(tr("Name:"), p), ++CR, 0);
@@ -421 +421 @@
   }
   nfoIp->setData(ip);
-  if (u->GetTimezone() == TIMEZONE_UNKNOWN)
-    nfoTime->setText(tr("Unknown"));
-  else
-  {
-    nfoTime->setText(tr("GMT%1%2%3")
-       .arg(u->GetTimezone() > 0 ? "-" : "+")
-       .arg(abs(u->GetTimezone() / 2)).arg(u->GetTimezone() % 2 ? "30" : "00") );
-  }
+  tznZone->setData(u->GetTimezone());
   nfoStatus->setData(u->StatusStr());
   if (m_bOwner)
   {
+    // Owner timezone is not editable, it is taken from system timezone instead
+    tznZone->setEnabled(false);
+
     const SCountry *c = GetCountryByCode(u->GetCountryCode());
     if (c == NULL)
@@ -498 +494 @@
     u->SetCountryCode(GetCountryByIndex(i)->nCode);
   }
+  u->SetTimezone(tznZone->data());
 
   u->SetEnableSave(true);

branches/qt-gui_qt4/src/userinfodlg.h

@@ -108 +108 @@
              *nfoAlias, *nfoIp, *nfoUin, *nfoCity, *nfoState,
              *nfoZipCode, *nfoAddress, *nfoCountry, *nfoFax, *nfoCellular,
-             *nfoPhone, *nfoTime, *nfoStatus;
+             *nfoPhone, *nfoStatus;
   QCheckBox *chkKeepAliasOnUpdate;
   CEComboBox *cmbCountry;
   QLabel *lblAuth, *lblICQHomepage;
+  CTimeZoneField *tznZone;
 
   // More info