added shortcut ctrl+0 for "restore default font and size in the ircview" , trying to keep it available for scripting, too

git-svn-id: https://svn.kvirc.de/svn/trunk/kvirc@5089 17fca916-40b9-46aa-a4ea-0a15b648b75c

6 files changed, 30 insertions, 8 deletions

diff --git a/src/kvilib/config/kvi_shortcuts.h b/src/kvilib/config/kvi_shortcuts.h
index 636bdebbe..ac1330cdb 100644
--- a/src/kvilib/config/kvi_shortcuts.h
+++ b/src/kvilib/config/kvi_shortcuts.h
@@ -206,8 +206,9 @@
 #define KVI_SHORTCUTS_INPUT_ESCAPE Qt::Key_Escape
 #define KVI_SHORTCUTS_INPUT_DUMMY Qt::ShiftModifier + Qt::Key_Escape
 #define KVI_SHORTCUTS_INPUT_DUMMY_2 Qt::ShiftModifier + Qt::Key_Delete
-#define KVI_SHORTCUTS_WIN_ZOOM_IN Qt::ControlModifier + Qt::Key_Plus
-#define KVI_SHORTCUTS_WIN_ZOOM_OUT Qt::ControlModifier + Qt::Key_Minus
+#define KVI_SHORTCUTS_WIN_ZOOM_IN QKeySequence::ZoomIn
+#define KVI_SHORTCUTS_WIN_ZOOM_OUT QKeySequence::ZoomOut
+#define KVI_SHORTCUTS_WIN_ZOOM_DEFAULT Qt::ControlModifier + Qt::Key_0
 
 /*
 	@doc: keyboard
@@ -244,6 +245,7 @@
 		[b]Ctrl+Z:[/b] Undo last action[br]
 		[b]Ctrl+"+":[/b] Increase font size[br]
 		[b]Ctrl+"-":[/b] Decrease font size[br]
+		[b]Ctrl+0:[/b] Restore default font (and font size)[br]
 		[b]Ctrl+Shift+A:[/b] Go away/back[br]
 		[b]Ctrl+Shift+B:[/b] Open "Manage Toolbars" dialog[br]
 		[b]Ctrl+Shift+C:[/b] Connect/disconnect current irc context[br]
diff --git a/src/kvirc/ui/kvi_frame.cpp b/src/kvirc/ui/kvi_frame.cpp
index 8bb50f81d..9405db198 100644
--- a/src/kvirc/ui/kvi_frame.cpp
+++ b/src/kvirc/ui/kvi_frame.cpp
@@ -98,7 +98,7 @@ KviFrame::KviFrame()
 	//disable this flag that gets enabled by qt when using Qt::WA_TranslucentBackground
 	setAttribute(Qt::WA_NoSystemBackground, false);
 	setWindowIcon(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_KVIRC)));
-	
+
 	m_pWinList  = new KviPointerList<KviWindow>;
 	setWindowTitle(KVI_DEFAULT_FRAME_CAPTION);
 	m_pWinList->setAutoDelete(false);
@@ -327,7 +327,7 @@ void KviFrame::installAccelerators()
 	int i=0, keys=0;
 	while((keys = accel_table[i]))
 	{
-		new QShortcut(QKeySequence(keys),this,SLOT(accelActivated()),0,Qt::ApplicationShortcut);
+		new QShortcut(QKeySequence(keys),this,SLOT(accelActivated()),SLOT(accelActivated()),Qt::ApplicationShortcut);
 		i++;
 	}
 }
@@ -504,7 +504,7 @@ void KviFrame::addWindow(KviWindow *wnd,bool bShow)
 			} else {
 				wnd->setGeometry(rect);
 				wnd->triggerCreationEvents();
-				
+
 				if(bShow)
 				{
 					if(bMaximized)
@@ -717,7 +717,7 @@ void KviFrame::childWindowActivated(KviWindow *wnd, bool bForce)
 			g_pActiveWindow->lostUserFocus();
 		g_pActiveWindow = wnd;
 	}
-	
+
 	m_pWindowList->setActiveItem(wnd->windowListItem());
 
 	bool bActiveContextChanged = (m_pActiveContext != wnd->context());
@@ -755,7 +755,7 @@ void KviFrame::changeEvent(QEvent * e)
 	}
 	KviTalMainWindow::changeEvent(e);
 }
-			
+
 void KviFrame::closeEvent(QCloseEvent *e)
 {
 	//check if the user just want us to minimize in tray; if we're not the sender
diff --git a/src/kvirc/ui/kvi_input_editor.cpp b/src/kvirc/ui/kvi_input_editor.cpp
index fc5d77204..cf5b8cc41 100644
--- a/src/kvirc/ui/kvi_input_editor.cpp
+++ b/src/kvirc/ui/kvi_input_editor.cpp
@@ -1335,7 +1335,8 @@ void KviInputEditor::installShortcuts()
 	new QShortcut(QKeySequence(KVI_SHORTCUTS_INPUT_DUMMY_2),this,SLOT(dummy()),0,Qt::WidgetShortcut);
 	new QShortcut(QKeySequence(KVI_SHORTCUTS_WIN_ZOOM_IN),this,SLOT(zoomIn()),0,Qt::WidgetShortcut);
 	new QShortcut(QKeySequence(KVI_SHORTCUTS_WIN_ZOOM_OUT),this,SLOT(zoomOut()),0,Qt::WidgetShortcut);
-
+	// this is currently ambigous, since we're using it for scripting, too
+	new QShortcut(QKeySequence(KVI_SHORTCUTS_WIN_ZOOM_DEFAULT),this,SLOT(zoomDefault()),SLOT(zoomDefault()),Qt::WidgetShortcut);
 }
 
 void KviInputEditor::zoomIn()
@@ -1352,6 +1353,13 @@ void KviInputEditor::zoomOut()
 			m_pKviWindow->view()->decreaseFontSize();
 }
 
+void KviInputEditor::zoomDefault()
+{
+	if(m_pKviWindow)
+		if(m_pKviWindow->view())
+			m_pKviWindow->view()->resetDefaultFont();
+}
+
 void KviInputEditor::keyPressEvent(QKeyEvent * e)
 {
 
diff --git a/src/kvirc/ui/kvi_input_editor.h b/src/kvirc/ui/kvi_input_editor.h
index 258ff2f57..f5c7d79dc 100644
--- a/src/kvirc/ui/kvi_input_editor.h
+++ b/src/kvirc/ui/kvi_input_editor.h
@@ -826,6 +826,12 @@ private slots:
 	* \return void
 	*/
 	void zoomOut();
+
+	/**
+	* \brief Restore the ircview font (and its size)
+	* \return void
+	*/
+	void zoomDefault();
 protected:
 	void completionEscapeUnsafeToken(QString &szToken);
 	void installShortcuts();
diff --git a/src/kvirc/ui/kvi_ircview.cpp b/src/kvirc/ui/kvi_ircview.cpp
index a9efe7c27..5d757b0ff 100644
--- a/src/kvirc/ui/kvi_ircview.cpp
+++ b/src/kvirc/ui/kvi_ircview.cpp
@@ -2089,6 +2089,11 @@ void KviIrcView::decreaseFontSize()
 	setFont(f);
 }
 
+void KviIrcView::resetDefaultFont()
+{
+	setFont(KVI_OPTION_FONT(KviOption_fontIrcView));
+}
+
 void KviIrcView::chooseFont()
 {
 	bool bOk;
diff --git a/src/kvirc/ui/kvi_ircview.h b/src/kvirc/ui/kvi_ircview.h
index 7b1e15a53..881b970ae 100644
--- a/src/kvirc/ui/kvi_ircview.h
+++ b/src/kvirc/ui/kvi_ircview.h
@@ -235,6 +235,7 @@ public slots:
 	void toggleToolWidget();
 	void increaseFontSize();
 	void decreaseFontSize();
+	void resetDefaultFont();
 	void chooseFont();
 	void chooseBackground();
 	void resetBackground();