Context Navigation

Changeset 433

Timestamp:

03/16/06 03:53:54 (3 years ago)

Author:

hipplej

Message:

Rough out a form for the help system.

Location:

trunk/src/gui

Files:

r420	r433
	1	#################################################################
	2	# $Id$
	3	#
	4	# Vidalia is distributed under the following license:
	5	#
	6	# Copyright (C) 2006, Matt Edman, Justin Hipple
	7	#
	8	# This program is free software; you can redistribute it and/or
	9	# modify it under the terms of the GNU General Public License
	10	# as published by the Free Software Foundation; either version 2
	11	# of the License, or (at your option) any later version.
	12	#
	13	# This program is distributed in the hope that it will be useful,
	14	# but WITHOUT ANY WARRANTY; without even the implied warranty of
	15	# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
	16	# GNU General Public License for more details.
	17	#
	18	# You should have received a copy of the GNU General Public License
	19	# along with this program; if not, write to the Free Software
	20	# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
	21	# 02110-1301, USA.
	22	#################################################################
	23
	24	FORMS += $$PWD/helpbrowser.ui
	25
	26	HEADERS += $$PWD/helpbrowser.h
	27
	28	SOURCES += $$PWD/helpbrowser.cpp

r356	r433
81	81	Qt::WFlags bw_flags = (Qt::Tool \| Qt::WindowStaysOnTopHint);
82	82	_bandwidthGraph = new BandwidthGraph(_torControl, this, bw_flags);
	83
	84	/* Create a new HelpBrowser object so we can display help to the user */
	85	_helpBrowser = new HelpBrowser(this);
83	86
84	87	/* Put an icon in the system tray to indicate the status of Tor */
…	…
186	189	connect(_messageAct, SIGNAL(triggered()),
187	190	this, SLOT(showMessageLog()));
	191
	192	_helpAct = new QAction(tr("Help"), this);
	193	connect(_helpAct, SIGNAL(triggered()),
	194	this, SLOT(showHelp()));
188	195	}
189	196
…	…
204	211	_trayMenu->addSeparator();
205	212	_trayMenu->addAction(_configAct);
	213	_trayMenu->addAction(_helpAct);
206	214	_trayMenu->addAction(_aboutAct);
207	215	_trayMenu->addSeparator();
…	…
239	247	_viewMenu->addAction(_configAct);
240	248	_helpMenu = _menuBar->addMenu(tr("Help"));
	249	_helpMenu->addAction(_helpAct);
241	250	_helpMenu->addAction(_aboutAct);
242	251	#endif
…	…
451	460	}
452	461
	462	/** Shows Help Browser. If the browser is already displayed, the existing
	463	* instance will be brought to the foreground. */
	464	void
	465	MainWindow::showHelp()
	466	{
	467	if(!_helpBrowser->isVisible()) {
	468	_helpBrowser->show();
	469	} else {
	470	_helpBrowser->activateWindow();
	471	_helpBrowser->raise();
	472	}
	473	}
	474

r422	r433
37	37	#include "bwgraph/bwgraph.h"
38	38	#include "config/configdialog.h"
	39	#include "help/browser/helpbrowser.h"
39	40
40	41
…	…
74	75	/** Called when the user selects "Configuration" from the menu. */
75	76	void showConfig();
	77	/** Called when the user selects "Help" from the menu. */
	78	void showHelp();
76	79	/** Called when the user exits Vidalia. */
77	80	void close();
…	…
96	99	/** A BandwidthGraph object which handles monitoring Tor bandwidth usage */
97	100	BandwidthGraph* _bandwidthGraph;
	101	/** A HelpBrowser object which handles displaying help files */
	102	HelpBrowser* _helpBrowser;
98	103	/** A TorControl object that handles communication with Tor */
99	104	TorControl* _torControl;
100	105	/** Instance of a tray icon that will appear in the system tray */
101		TrayIcon* _trayIcon;
	106	TrayIcon* _trayIcon;
102	107
103	108	/** Define the popup menus for the system tray icon */
…	…
111	116	QAction* _bandwidthAct;
112	117	QAction* _messageAct;
	118	QAction* _helpAct;
113	119
114	120	/* GUI elements unique on Mac so we can use the system menubar */