|
 |
f325b2 |
From 2252f488aec993855c44d884747394ff15810fac Mon Sep 17 00:00:00 2001
|
|
|
f325b2 |
From: Miklos Vajna <vmiklos@collabora.co.uk>
|
|
|
f325b2 |
Date: Tue, 15 Sep 2015 15:05:51 +0200
|
|
|
f325b2 |
Subject: [PATCH 134/398] gtktiledviewer: factor out setupDocView() from main()
|
|
|
f325b2 |
|
|
|
f325b2 |
Change-Id: Iac803f03267859c11f0f9090346b09b90c115b76
|
|
|
f325b2 |
(cherry picked from commit 8d8a8e1a2ea26df6d676495af7f017baa071153d)
|
|
|
f325b2 |
---
|
|
|
f325b2 |
.../qa/gtktiledviewer/gtktiledviewer.cxx | 30 ++++++++++++----------
|
|
|
f325b2 |
1 file changed, 17 insertions(+), 13 deletions(-)
|
|
|
f325b2 |
|
|
|
f325b2 |
diff --git a/libreofficekit/qa/gtktiledviewer/gtktiledviewer.cxx b/libreofficekit/qa/gtktiledviewer/gtktiledviewer.cxx
|
|
|
f325b2 |
index b43f785a300a..53bc5ea39615 100644
|
|
|
f325b2 |
--- a/libreofficekit/qa/gtktiledviewer/gtktiledviewer.cxx
|
|
|
f325b2 |
+++ b/libreofficekit/qa/gtktiledviewer/gtktiledviewer.cxx
|
|
|
f325b2 |
@@ -716,6 +716,21 @@ static GtkWidget* createWindow(TiledWindow& rWindow)
|
|
|
f325b2 |
return pWindow;
|
|
|
f325b2 |
}
|
|
|
f325b2 |
|
|
|
f325b2 |
+/// Common setup for DocView (regardless if it's just a new view or a document to be loaded).
|
|
|
f325b2 |
+static void setupDocView(GtkWidget* pDocView)
|
|
|
f325b2 |
+{
|
|
|
f325b2 |
+#if GLIB_CHECK_VERSION(2,40,0)
|
|
|
f325b2 |
+ g_assert_nonnull(pDocView);
|
|
|
f325b2 |
+#endif
|
|
|
f325b2 |
+ g_signal_connect(pDocView, "edit-changed", G_CALLBACK(signalEdit), NULL);
|
|
|
f325b2 |
+ g_signal_connect(pDocView, "command-changed", G_CALLBACK(signalCommand), NULL);
|
|
|
f325b2 |
+ g_signal_connect(pDocView, "search-not-found", G_CALLBACK(signalSearch), NULL);
|
|
|
f325b2 |
+ g_signal_connect(pDocView, "part-changed", G_CALLBACK(signalPart), NULL);
|
|
|
f325b2 |
+ g_signal_connect(pDocView, "size-changed", G_CALLBACK(signalSize), NULL);
|
|
|
f325b2 |
+ g_signal_connect(pDocView, "hyperlink-clicked", G_CALLBACK(signalHyperlink), NULL);
|
|
|
f325b2 |
+ g_signal_connect(pDocView, "cursor-changed", G_CALLBACK(cursorChanged), NULL);
|
|
|
f325b2 |
+}
|
|
|
f325b2 |
+
|
|
|
f325b2 |
int main( int argc, char* argv[] )
|
|
|
f325b2 |
{
|
|
|
f325b2 |
if( argc < 3 ||
|
|
|
f325b2 |
@@ -730,19 +745,8 @@ int main( int argc, char* argv[] )
|
|
|
f325b2 |
|
|
|
f325b2 |
gtk_init( &argc, &argv );
|
|
|
f325b2 |
|
|
|
f325b2 |
- // Docview
|
|
|
f325b2 |
- GtkWidget* pDocView = lok_doc_view_new (argv[1], NULL, NULL);
|
|
|
f325b2 |
-#if GLIB_CHECK_VERSION(2,40,0)
|
|
|
f325b2 |
- g_assert_nonnull(pDocView);
|
|
|
f325b2 |
-#endif
|
|
|
f325b2 |
- g_signal_connect(pDocView, "edit-changed", G_CALLBACK(signalEdit), NULL);
|
|
|
f325b2 |
- g_signal_connect(pDocView, "command-changed", G_CALLBACK(signalCommand), NULL);
|
|
|
f325b2 |
- g_signal_connect(pDocView, "search-not-found", G_CALLBACK(signalSearch), NULL);
|
|
|
f325b2 |
- g_signal_connect(pDocView, "part-changed", G_CALLBACK(signalPart), NULL);
|
|
|
f325b2 |
- g_signal_connect(pDocView, "size-changed", G_CALLBACK(signalSize), NULL);
|
|
|
f325b2 |
- g_signal_connect(pDocView, "hyperlink-clicked", G_CALLBACK(signalHyperlink), NULL);
|
|
|
f325b2 |
- g_signal_connect(pDocView, "cursor-changed", G_CALLBACK(cursorChanged), NULL);
|
|
|
f325b2 |
-
|
|
|
f325b2 |
+ GtkWidget* pDocView = lok_doc_view_new(argv[1], NULL, NULL);
|
|
|
f325b2 |
+ setupDocView(pDocView);
|
|
|
f325b2 |
TiledWindow aWindow;
|
|
|
f325b2 |
aWindow.m_pDocView = pDocView;
|
|
|
f325b2 |
createWindow(aWindow);
|
|
|
f325b2 |
--
|
|
|
f325b2 |
2.12.0
|
|
|
f325b2 |
|