[Author Prev][Author Next][Thread Prev][Thread Next][Author Index][Thread Index]
[vidalia-svn] r1702: Make MainWindow inherit VidaliaWindow, so it will remember i (in trunk: . src/gui)
Author: edmanm
Date: 2007-04-08 23:28:49 -0400 (Sun, 08 Apr 2007)
New Revision: 1702
Modified:
trunk/
trunk/src/gui/mainwindow.cpp
trunk/src/gui/mainwindow.h
Log:
r1787@adrastea: edmanm | 2007-04-08 23:22:58 -0400
Make MainWindow inherit VidaliaWindow, so it will remember its position
after you exit Vidalia.
Property changes on: trunk
___________________________________________________________________
svk:merge ticket from /vidalia/local/trunk [r1787] on 54b3572a-7227-0410-958f-53ecd705b71a
Modified: trunk/src/gui/mainwindow.cpp
===================================================================
--- trunk/src/gui/mainwindow.cpp 2007-04-09 03:12:06 UTC (rev 1701)
+++ trunk/src/gui/mainwindow.cpp 2007-04-09 03:28:49 UTC (rev 1702)
@@ -104,6 +104,7 @@
/** Default constructor. It installs an icon in the system tray area and
* creates the popup menu associated with that icon. */
MainWindow::MainWindow()
+: VidaliaWindow("MainWindow")
{
VidaliaSettings settings;
Modified: trunk/src/gui/mainwindow.h
===================================================================
--- trunk/src/gui/mainwindow.h 2007-04-09 03:12:06 UTC (rev 1701)
+++ trunk/src/gui/mainwindow.h 2007-04-09 03:28:49 UTC (rev 1702)
@@ -41,7 +41,8 @@
#undef USE_QSYSTEMTRAYICON
#include "tray/trayicon.h"
#endif
-
+
+#include "common/vidaliawindow.h"
#include "about/aboutdialog.h"
#include "log/messagelog.h"
#include "bwgraph/bwgraph.h"
@@ -51,7 +52,7 @@
#include "ui_mainwindow.h"
-class MainWindow : public QMainWindow
+class MainWindow : public VidaliaWindow
{
Q_OBJECT