From 7ff76baaeacb2913cf2bdc79473d25f727fadc5c Mon Sep 17 00:00:00 2001
From: Robert Williams <rwilliams@jrc-utah.com>
Date: Sat, 21 Feb 1998 21:13:40 +0000
Subject: [PATCH] Version 0.4.2   * [Robert Williams]  Added version.h and
 ChangeLog   * [Robert Williams]  Renamed Kdvi.kdelnk to kdvi.kdelnk   *
 [Robert Williams]  Added -caption "%c" to kdvi.kdelnk   * [Robert Williams] 
 Added getHelpMenu()

svn path=/trunk/kdegraphics/kdvi/; revision=5484
---
 ChangeLog                  |  5 +++++
 Makefile.am                |  2 +-
 kdvi.cpp                   | 18 +++++++++---------
 kdvi.h                     |  6 +++---
 Kdvi.kdelnk => kdvi.kdelnk |  2 +-
 version.h                  |  1 +
 6 files changed, 20 insertions(+), 14 deletions(-)
 create mode 100644 ChangeLog
 rename Kdvi.kdelnk => kdvi.kdelnk (94%)
 create mode 100644 version.h

diff --git a/ChangeLog b/ChangeLog
new file mode 100644
index 000000000..adb3beda6
--- /dev/null
+++ b/ChangeLog
@@ -0,0 +1,5 @@
+Version 0.4.2
+  * [Robert Williams]  Added version.h and ChangeLog
+  * [Robert Williams]  Renamed Kdvi.kdelnk to kdvi.kdelnk
+  * [Robert Williams]  Added -caption "%c" to kdvi.kdelnk
+  * [Robert Williams]  Added getHelpMenu()
diff --git a/Makefile.am b/Makefile.am
index 9e1afabb8..9888daf7a 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -70,7 +70,7 @@ messages:
 # if you have more of them, create a subdirectory with an extra Makefile 
 install-data-local: 
 	$(mkinstalldirs) $(APPSDIR)
-	$(INSTALL_DATA) Kdvi.kdelnk $(APPSDIR)
+	$(INSTALL_DATA) kdvi.kdelnk $(APPSDIR)
 	$(mkinstalldirs) $(kde_icondir)
 	$(INSTALL_DATA) pix/kdvi.xpm $(kde_icondir)
 	$(mkinstalldirs) $(kde_minidir)
diff --git a/kdvi.cpp b/kdvi.cpp
index e56e48dba..5e0ad80de 100644
--- a/kdvi.cpp
+++ b/kdvi.cpp
@@ -30,6 +30,7 @@
 #include "print.h"
 #include "pushbutton.h"
 #include "prefs.h"
+#include "version.h"
 
 #include <unistd.h>
 #include <signal.h>
@@ -157,7 +158,7 @@ void kdvi::closeEvent( QCloseEvent *e )
 
 static QPopupMenu *m_f, *m_v, *m_p, *m_o, *m_h;
 static int m_fn, m_fo, m_fr, m_fp, m_fx, m_vi, m_vo, m_vf, m_vw, m_vr, m_pp, m_pn, m_pf, m_pl, m_pg,
-	m_op, m_ok, m_of, m_o0, m_om, m_ob, m_ot, m_os, m_ol,  m_hc, m_ha, m_hq;
+	m_op, m_ok, m_of, m_o0, m_om, m_ob, m_ot, m_os, m_ol,  m_hc; // , m_ha, m_hq;
 	
 void kdvi::makeMenuBar()
 {
@@ -234,15 +235,13 @@ void kdvi::makeMenuBar()
 
 	menuBar->insertSeparator();
 
-	p = new QPopupMenu;
-	CHECK_PTR( p );
-	m_hc = p->insertItem( translate("&Contents"),	this, SLOT(helpContents()) );
-	p->insertSeparator();
-	m_ha = p->insertItem( translate("&About"),	this, SLOT(helpAbout()) );
-	m_hq = p->insertItem( translate("About &Qt"),	this, SLOT(helpAboutQt()) );
+	QPopupMenu *help = kapp->getHelpMenu(true, QString("DVI Viewer")
+                                         + " " + KDVI_VERSION
+                                         + "\n\nby Markku Hihnala"
+                                         + " (mah@ee.oulu.fi)");
 
 	m_h = p;
-	menuBar->insertItem( translate("&Help"), p, -2 );
+	menuBar->insertItem( translate("&Help"), help );
 	if ( hideMenubar )	menuBar->hide();
 	setMenu( menuBar );
 }
@@ -829,7 +828,7 @@ void kdvi::helpContents()
 {
 	kapp->invokeHTMLHelp("","");
 }
-
+/*
 void kdvi::helpAbout()
 {
 	QMessageBox::information( this, translate("About Kdvi"),
@@ -843,6 +842,7 @@ void kdvi::helpAboutQt()
 {
 	QMessageBox::aboutQt( this, "About Qt" );
 }
+*/
 
 void kdvi::pannerChanged()
 {
diff --git a/kdvi.h b/kdvi.h
index 1d6d24ffd..f394d0441 100644
--- a/kdvi.h
+++ b/kdvi.h
@@ -4,7 +4,7 @@
 // Previewer for TeX DVI files.
 //
 
-#define KDVI_VERSION "0.4.1"
+//#define KDVI_VERSION "0.4.1"
 
 #include <qframe.h>
 #include <qlabel.h>
@@ -67,8 +67,8 @@ private slots:
 	void		toggleShowStatusbar();
 	void		toggleShowScrollbars();
 	void		helpContents();
-	void		helpAbout();
-	void		helpAboutQt();
+//	void		helpAbout();
+//	void		helpAboutQt();
 	void		pannerChanged();
 	void		pageActivated(const char *);
 	void		setPage(int p=0);
diff --git a/Kdvi.kdelnk b/kdvi.kdelnk
similarity index 94%
rename from Kdvi.kdelnk
rename to kdvi.kdelnk
index ec3b3efe7..b0c194a2f 100644
--- a/Kdvi.kdelnk
+++ b/kdvi.kdelnk
@@ -14,7 +14,7 @@ Name[hu]=DVI n
 Name[pt]=Visualizador de DVIs
 MimeType=application/x-dvi;
 Comment=TeX DVI File Viewer
-Exec=kdvi %f
+Exec=kdvi %f -caption "%c"
 TerminalOptions=
 Icon=kdvi.xpm
 MiniIcon=kdvi.xpm
diff --git a/version.h b/version.h
new file mode 100644
index 000000000..65d9b7e36
--- /dev/null
+++ b/version.h
@@ -0,0 +1 @@
+#define KDVI_VERSION	"0.4.2"