Changeset 3002

Timestamp:

06/11/06 06:18:41 (3 years ago)

Author:

madcat

Message:

Experimental tray icon code.

Files:

• hydranode/hngui/Jamfile (modified) (3 diffs)
• hydranode/hngui/main.cpp (modified) (13 diffs)
• hydranode/hngui/main.h (modified) (2 diffs)
• hydranode/hngui/trayicon.cpp (added)
• hydranode/hngui/trayicon.h (added)
• hydranode/hngui/trayicon_mac.cpp (added)
• hydranode/hngui/trayicon_win.cpp (added)
• hydranode/hngui/trayicon_x11.cpp (added)

hydranode/hngui/Jamfile

@@ -4 +4 @@
-local extrasrc ;
-if [ os.name ] = NT {
-
+
+
+
-}
-
-
+
+
-          mainlayout.ui 
-          transfercontent.ui searchcontent.ui librarycontent.ui
@@ -14 +17 @@
-          pagetemplate.ui home_homeactions.ui home_homepage.ui catdialog.ui
-          commentframe.ui
+        
-        # gui code
-          downloadlist.cpp downloadlist.h 
@@ -29 +33 @@
-          myhydra.cpp myhydra.h
-          customheader.cpp customheader.h
+        
-        # gui resources
-
+
+
-        # extra sources
-          ../hncgcomm/cgcomm.cpp ../hncgcomm/utils.cpp ecomm.cpp ecomm.h 
-
+
+
-        # dependancies
-           /qt4//QtGui /qt4//QtNetwork /qt4//QtXml
-          ../extra//boost_signals ../extra//boost_date_time
-
+  
-        # plugins (built-in currently due to lack of support for plugin loading)
-          plugins/donkeypage.cpp plugins/donkeypage.h plugins/donkeypage_ui.ui
+        
+        # platform-specific sources
+          $(extrasrc)
-        : <include>. 
-          <define>QT_NO_KEYWORDS
-          <variant>release:<define>QT_NO_DEBUG
-          <variant>profile:<define>QT_NO_DEBUG
+          <toolset>msvc,<variant>debug:<linkflags>/NODEFAULTLIB:libcmtd.lib
+          <toolset>msvc,<variant>release:<linkflags>/NODEFAULTLIB:libcmt.lib
-;
-

hydranode/hngui/main.cpp

@@ -26 +26 @@
-#include "librarytabs.h"
-#include "ecomm.h"
+#include "trayicon.h"
-#include <QApplication>
-#include <QTextEdit>
@@ -96 +97 @@
-}
-
-
-
+
+
+
+
-        m_splash = new Splash(QPixmap(imgDir() + "splash.png"));
-        connect(
@@ -150 +153 @@
-
-void MainWindow::initConfig() {
+        doLogDebug("Initializing configuration...");
+
-        QSettings conf(confDir() + "gui.ini", QSettings::IniFormat);
-        if (!conf.contains("EnableBack")) {
@@ -167 +172 @@
-void MainWindow::initGui() {
-        initConfig();
+        doLogDebug("Initializing GUI pages...");
-
-        m_ui = new Ui::MainLayout;
@@ -196 +202 @@
-        setWindowTitle("Hydranode");
-        setWindowIcon(QIcon(":/hydranode.png"));
+
+        QMenu *menu = new QMenu(this);
+        menu->addAction("Quit", this, SLOT(close()));
+        m_tray = new TrayIcon(0, "Hydranode");
+        m_tray->setIcon(QPixmap("hydranode.png"));
+        m_tray->setPopup(menu);
-
-        QSettings conf(confDir() + "gui.ini", QSettings::IniFormat);
@@ -343 +355 @@
-
-void MainWindow::initData() {
-
+
+
-        engineConnection(true);
-        if (m_splash) {
-                m_splash->finish(this);
-        }
+//      if (m_tray) {
+//              m_tray->show();
+//      }
-        show();
-        if (m_splash) {
@@ -361 +377 @@
-                );
-        }
+        doLogDebug("Testing for running core...");
-        QTcpSocket s(this);
-        s.connectToHost(url, port);
@@ -375 +392 @@
-                );
-        }
+
+        doLogDebug("No running core found; starting core process...");
-        m_core = new QProcess(this);
-        m_core->setReadChannelMode(QProcess::MergedChannels);
@@ -428 +447 @@
-                );
-        }
+        doLogDebug("Initializing core/gui communication...");
+
-        m_ecomm = new EngineComm;
-        connect(m_ecomm, SIGNAL(connectionEstablished()), SLOT(initData()));
@@ -461 +482 @@
-
-void MainWindow::coreDied(QProcess::ProcessError err) {
-q
+doLog
-        QString errorMsg;
-        if (err == QProcess::FailedToStart) {
@@ -495 +516 @@
-
-void MainWindow::coreExited(int exitCode, QProcess::ExitStatus exitStatus) {
+        doLogDebug("Core process finished.");
+
-        if (exitStatus != QProcess::NormalExit) {
-                QMessageBox::critical(
@@ -510 +533 @@
-
-void MainWindow::closeEvent(QCloseEvent *e) {
+        doLogDebug("Received main window close event; shutting down.");
+
-        if (m_core && m_core->state() == QProcess::Running) {
-//              if (!m_splash) {
@@ -952 +977 @@
-                        QMessageBox::NoButton
-                );
+                doLogDebug(std::string("CRITICAL: ") + e.what());
-                return 0;
-        } else {

hydranode/hngui/main.h

@@ -39 +39 @@
-class Splash;
-class QToolButton;
+class TrayIcon;
-
-enum {
@@ -114 +115 @@
-
-        Splash *m_splash;
+        TrayIcon *m_tray;
-        int            m_corePort;
-        QString m_cmdLine; // command-line used for starting core process