[Tora-cvs] SF.net SVN: tora:[3952] trunk/tora/src

[<mrj...@us...>]

Revision: 3952
          http://tora.svn.sourceforge.net/tora/?rev=3952&view=rev
Author:   mrjohnson0
Date:     2011-05-02 06:29:36 +0000 (Mon, 02 May 2011)

Log Message:
-----------
Fix docklets on the Mac

Modified Paths:
--------------
    trunk/tora/src/docklets/toviewconnections.cpp
    trunk/tora/src/docklets/toviewdirectory.cpp
    trunk/tora/src/todocklet.cpp

Modified: trunk/tora/src/docklets/toviewconnections.cpp
===================================================================
--- trunk/tora/src/docklets/toviewconnections.cpp	2011-04-25 17:11:40 UTC (rev 3951)
+++ trunk/tora/src/docklets/toviewconnections.cpp	2011-05-02 06:29:36 UTC (rev 3952)
@@ -46,11 +46,7 @@
 
 #include <QHeaderView>
 
-#ifndef Q_WS_MAC
 REGISTER_VIEW("Connection", toViewConnections);
-#else
-#warning toDocklets are broken on mac - volunteers wanted for fix
-#endif
 
 toViewConnections::toViewConnections(QWidget *parent,
                                  Qt::WindowFlags flags)

Modified: trunk/tora/src/docklets/toviewdirectory.cpp
===================================================================
--- trunk/tora/src/docklets/toviewdirectory.cpp	2011-04-25 17:11:40 UTC (rev 3951)
+++ trunk/tora/src/docklets/toviewdirectory.cpp	2011-05-02 06:29:36 UTC (rev 3952)
@@ -51,11 +51,7 @@
 #include <QMdiSubWindow>
 
 
-#ifndef Q_WS_MAC
 REGISTER_VIEW("Directory", toViewDirectory);
-#else
-#warning toDocklets are broken on mac - volunteers wanted for fix
-#endif
 
 toViewDirectory::toViewDirectory(QWidget *parent,
                                  Qt::WindowFlags flags)

Modified: trunk/tora/src/todocklet.cpp
===================================================================
--- trunk/tora/src/todocklet.cpp	2011-04-25 17:11:40 UTC (rev 3951)
+++ trunk/tora/src/todocklet.cpp	2011-05-02 06:29:36 UTC (rev 3952)
@@ -149,7 +149,7 @@
     {
         if(isPopup)                             // may be open in dock
         {
-            setWindowFlags(0);                  // defaults
+            // setWindowFlags(0);                  // defaults
             hide();
             isPopup = false;                    // not anymore
             setWindowModality(Qt::NonModal);


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.