Changeset 6040

Timestamp:

01/14/08 03:57:46 (9 months ago)

Author:

eugene

Message:

Prepared config interface for mainwin geometry.

Location:

branches/qt-gui_qt4/src/config

Files:

• general.cpp (modified) (4 diffs)
• general.h (modified) (4 diffs)

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

@@ -24 +24 @@
 
 #include <QApplication>
+#include <QDesktopWidget>
 
 #include <licq_file.h>
@@ -105 +106 @@
   iniFile.ReadNum("AutoNAMess", myAutoNaMess, 0);
 
+  iniFile.SetSection("geometry");
+  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;
+  myMainwinRect.setRect(xPos, yPos, wVal, hVal);
+
   emit msgPopupKeyChanged(myMsgPopupKey);
   emit mainwinChanged();
@@ -146 +159 @@
   iniFile.WriteNum("AutoAwayMess", myAutoAwayMess);
   iniFile.WriteNum("AutoNAMess", myAutoNaMess);
+
+  iniFile.SetSection("geometry");
+  iniFile.WriteNum("x", static_cast<short>(myMainwinRect.x()));
+  iniFile.WriteNum("y", static_cast<short>(myMainwinRect.y()));
+  iniFile.WriteNum("w", static_cast<short>(myMainwinRect.width()));
+  iniFile.WriteNum("h", static_cast<short>(myMainwinRect.height()));
 }
 
@@ -307 +326 @@
 }
 
+void Config::General::setMainwinRect(QRect geometry)
+{
+  if (geometry.isValid())
+    myMainwinRect = geometry;
+}
+
 void Config::General::setDockMode(DockMode dockMode)
 {

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

@@ -24 +24 @@
 #include "config.h"
 
-#include <QApplication>
 #include <QFont>
 #include <QObject>
+#include <QRect>
 
 class CIniFile;
@@ -89 +89 @@
   bool autoRaiseMainwin() const { return myAutoRaiseMainwin; }
   bool mainwinStartHidden() const { return myMainwinStartHidden; }
+  QRect mainwinRect() const { return myMainwinRect; }
 
   DockMode dockMode() const { return myDockMode; }
@@ -128 +129 @@
   void setAutoRaiseMainwin(bool autoRaiseMainwin);
   void setMainwinStartHidden(bool mainwinStartHidden);
+  void setMainwinRect(QRect geometry);
 
   void setDockMode(DockMode dockMode);
@@ -198 +200 @@
   bool myFrameTransparent;
   unsigned short myFrameStyle;
+  QRect myMainwinRect;
 
   // Dock configuration