Changeset 5881

Timestamp:

11/28/07 02:53:13 (12 months ago)

Author:

eugene

Message:

Made tabbed dialog position to be saved and restored.

Location:

branches/qt-gui_qt4/src

Files:

• config/chat.cpp (modified) (4 diffs)
• config/chat.h (modified) (4 diffs)
• core/licqgui.cpp (modified) (2 diffs)
• userevents/usereventtabdlg.cpp (modified) (3 diffs)
• userevents/usereventtabdlg.h (modified) (1 diff)

branches/qt-gui_qt4/src/config/chat.cpp

@@ -22 +22 @@
 
 #include "config.h"
+
+#include <QApplication>
+#include <QDesktopWidget>
 
 #include <licq_file.h>
@@ -100 +103 @@
   myDefaultEncoding = szTemp;
   iniFile.ReadBool("ShowAllEncodings", myShowAllEncodings, false);
+
+  iniFile.SetSection("dialog");
+  short xPos, yPos, wVal, hVal;
+  iniFile.ReadNum("x", xPos, 0);
+  iniFile.ReadNum("y", yPos, 0);
+  iniFile.ReadNum("w", wVal, 0);
+  iniFile.ReadNum("h", hVal, 0);
+  if (xPos > QApplication::desktop()->width() - 16)
+    xPos = 0;
+  if (yPos > QApplication::desktop()->height() - 16)
+    yPos = 0;
+  myDialogRect.setRect(xPos, yPos, wVal, hVal);
 }
 
@@ -146 +161 @@
   iniFile.WriteStr("DefaultEncoding", myDefaultEncoding);
   iniFile.WriteBool("ShowAllEncodings", myShowAllEncodings);
+
+  iniFile.SetSection("dialog");
+  iniFile.WriteNum("x", static_cast<short>(myDialogRect.x()));
+  iniFile.WriteNum("y", static_cast<short>(myDialogRect.y()));
+  iniFile.WriteNum("w", static_cast<short>(myDialogRect.width()));
+  iniFile.WriteNum("h", static_cast<short>(myDialogRect.height()));
 }
 
@@ -457 +478 @@
 }
 
+void Config::Chat::setDialogRect(QRect geometry)
+{
+  if (geometry.isValid())
+    myDialogRect = geometry;
+}
+
 void Config::Chat::changeChatColors()
 {

branches/qt-gui_qt4/src/config/chat.h

@@ -25 +25 @@
 
 #include <QObject>
+#include <QRect>
 
 class CIniFile;
@@ -101 +102 @@
   QString tabTypingColor() const { return myTabTypingColor; }
   QString chatBackColor() const { return myChatBackColor; }
+  QRect dialogRect() const { return myDialogRect; }
 
 public slots:
@@ -150 +152 @@
   void setTabTypingColor(QString tabTypingColor);
   void setChatBackColor(QString chatBackColor);
+  void setDialogRect(QRect geometry);
 
 signals:
@@ -202 +205 @@
   QByteArray myDefaultEncoding;
 
+  QRect myDialogRect;
+
   void changeChatColors();
 };

branches/qt-gui_qt4/src/core/licqgui.cpp

@@ -255 +255 @@
 LicqGui::~LicqGui()
 {
+  saveConfig();
   delete mySignalManager;
   delete myLogWindow;
@@ -278 +279 @@
     licqConf.CreateSection("floaties");
     licqConf.CreateSection("geometry");
+    licqConf.CreateSection("dialog");
     licqConf.FlushFile();
 

branches/qt-gui_qt4/src/userevents/usereventtabdlg.cpp

@@ -48 +48 @@
   lay->setContentsMargins(0, 0, 0, 0);
 
+  if (Config::Chat::instance()->dialogRect().isValid())
+    setGeometry(Config::Chat::instance()->dialogRect());
+
   tabw = new TabWidget();
   lay->addWidget(tabw);
@@ -59 +62 @@
 UserEventTabDlg::~UserEventTabDlg()
 {
+  saveGeometry();
   emit signal_done();
 }
@@ -275 +279 @@
   QTimer::singleShot(e->clearDelay, e, SLOT(slotClearNewEvents()));
 }
+
+void UserEventTabDlg::saveGeometry()
+{
+  Config::Chat::instance()->setDialogRect(geometry());
+}
+
+void UserEventTabDlg::moveEvent(QMoveEvent* /* e */)
+{
+  saveGeometry();
+}
+
+void UserEventTabDlg::resizeEvent(QResizeEvent* /* e */)
+{
+  saveGeometry();
+}

branches/qt-gui_qt4/src/userevents/usereventtabdlg.h

@@ -69 +69 @@
   void updateTitle(QWidget* tab);
   void clearEvents(QWidget* tab);
+  void saveGeometry();
+
+  virtual void moveEvent(QMoveEvent* e);
+  virtual void resizeEvent(QResizeEvent* e);
 };